proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-05 18:27:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2923 from flx42/more-pdeathsig-fixes

Browse Source 
More pdeathsig fixes
This commit is contained in:
Christian Brauner 2019-04-04 16:50:41 +02:00 committed by GitHub
commit 4f34c6f95d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/start.c
View File

@ -1190,7 +1190,7 @@ static int do_start(void *data)
goto out_warn_father; goto out_warn_father;
/* set{g,u}id() clears deathsignal */ /* set{g,u}id() clears deathsignal */
ret = lxc_set_death_signal(SIGKILL, 0); ret = lxc_set_death_signal(SIGKILL, handler->monitor_pid);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set PR_SET_PDEATHSIG to SIGKILL"); SYSERROR("Failed to set PR_SET_PDEATHSIG to SIGKILL");
goto out_warn_father; goto out_warn_father;
@ -1438,7 +1438,7 @@ static int do_start(void *data)
} }
if (handler->conf->monitor_signal_pdeath != SIGKILL) { if (handler->conf->monitor_signal_pdeath != SIGKILL) {
ret = lxc_set_death_signal(handler->conf->monitor_signal_pdeath, 0); ret = lxc_set_death_signal(handler->conf->monitor_signal_pdeath, handler->monitor_pid);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set PR_SET_PDEATHSIG to %d", SYSERROR("Failed to set PR_SET_PDEATHSIG to %d",
handler->conf->monitor_signal_pdeath); handler->conf->monitor_signal_pdeath);