proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-06-12 14:31:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc-execute to return exit code of its child not others

Browse Source 
lxc-execute has to return the exit code of it's child not others
as today's code would return the exit code of the last child.
We need to track the first process we launched and store its
exit status when it exits. In order to avoid to detect the exit
of this pid several time if the pids number wrap, we put an extra
flag saying the process group is orhpan.

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Michel Normand 2009-06-25 11:21:56 +02:00 committed by Daniel Lezcano
parent 7cbfc4e441
commit 37c3dfc9c9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lxc/lxc_init.c
View File

@ -106,8 +106,10 @@ int main(int argc, char *argv[])
exit(err);
}
err = 0;
for (;;) {
int status;
int orphan = 0;
pid_t waited_pid;
waited_pid = wait(&status);
@ -118,9 +120,16 @@ int main(int argc, char *argv[])
continue;
ERROR("failed to wait child : %s", strerror(errno));
goto out;
} else {
err = lxc_error_set_and_log(waited_pid, status);
}
/*
* keep the exit code of started application (not wrapped pid)
* and continue to wait for the end of the orphan group.
*/
if ((waited_pid != pid) || (orphan ==1))
continue;
orphan = 1;
err = lxc_error_set_and_log(waited_pid, status);
}
out:
return err;