picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: simplify exit condition check

Browse source
This commit is contained in:
Lennart Poettering 2014-06-30 15:19:00 +02:00
parent 8baaf7a3d8
commit ce9f1527b6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nspawn/nspawn.c
View file

@ -3309,14 +3309,15 @@ check_container_status:
r = wait_for_container(pid, &container_status);
pid = 0;
if (r != 0) {
/* If r < 0, explicitly set to EXIT_FAILURE,
* otherwise return the exit code of the
* containered process. */
if (r < 0)
r = EXIT_FAILURE;
if (r < 0) {
/* We failed to wait for the container, or the
* container exited abnormally */
r = EXIT_FAILURE;
break;
} else if (container_status == CONTAINER_TERMINATED)
} else if (r > 0 || container_status == CONTAINER_TERMINATED)
/* The container exited with a non-zero
* status, or with zero status and no reboot
* was requested. */
break;
/* CONTAINER_REBOOTED, loop again */