proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-11 01:43:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc.init: correctly exit with the app's error code

Browse Source 
Based on the comments in the code (and the have_status flag), the intent
here (and IMO, the desired behavior) should be for init.lxc to propagate
the actual exit code from the real application process up through.
Otherwise, it is swallowed and nobody can access it.

The bug being fixed here is that ret held the correct exit code, but when
it went around the loop again (to wait for other children) ret is
clobbered. Let's save the desired exit status somewhere else, so it can't
get clobbered, and we propagate things correctly.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
This commit is contained in:
Tycho Andersen 2018-01-19 03:21:10 +00:00
parent 19cfa02c4c
commit 4f4530faa7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_init.c
View File

@ -202,7 +202,7 @@ int main(int argc, char *argv[])
struct sigaction act;
struct lxc_log log;
sigset_t mask, omask;
int have_status = 0, shutdown = 0;
int have_status = 0, exit_with = 1, shutdown = 0;
if (arguments_parse(&my_args, argc, argv))
exit(EXIT_FAILURE);
@ -420,14 +420,14 @@ int main(int argc, char *argv[])
* pid) and continue to wait for the end of the orphan group.
*/
if (waited_pid == pid && !have_status) {
ret = lxc_error_set_and_log(waited_pid, status);
exit_with = lxc_error_set_and_log(waited_pid, status);
have_status = 1;
}
}
out:
if (ret < 0)
exit(EXIT_FAILURE);
exit(ret);
exit(exit_with);
}
static void print_usage(const struct option longopts[])