clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 21:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: don't make up -1 as error code

Browse Source 
(cherry picked from commit fddbb89c46)
This commit is contained in:
Lennart Poettering
2014-11-02 16:40:28 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent deb5897054
commit c986f1e5ff
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+11 -16
View File
@@ -2931,33 +2931,30 @@ static int wait_for_container(pid_t pid, ContainerStatus *container) {
}
switch (status.si_code) {
case CLD_EXITED:
r = status.si_status;
if (r == 0) {
if (!arg_quiet)
log_debug("Container %s exited successfully.",
arg_machine);
log_debug("Container %s exited successfully.", arg_machine);
*container = CONTAINER_TERMINATED;
} else {
log_error("Container %s failed with error code %i.",
arg_machine, status.si_status);
}
} else
log_error("Container %s failed with error code %i.", arg_machine, status.si_status);
break;
case CLD_KILLED:
if (status.si_status == SIGINT) {
if (!arg_quiet)
log_info("Container %s has been shut down.",
arg_machine);
log_info("Container %s has been shut down.", arg_machine);
*container = CONTAINER_TERMINATED;
r = 0;
break;
} else if (status.si_status == SIGHUP) {
if (!arg_quiet)
log_info("Container %s is being rebooted.",
arg_machine);
log_info("Container %s is being rebooted.", arg_machine);
*container = CONTAINER_REBOOTED;
r = 0;
@@ -2966,15 +2963,13 @@ static int wait_for_container(pid_t pid, ContainerStatus *container) {
/* CLD_KILLED fallthrough */
case CLD_DUMPED:
log_error("Container %s terminated by signal %s.",
arg_machine, signal_to_string(status.si_status));
r = -1;
log_error("Container %s terminated by signal %s.", arg_machine, signal_to_string(status.si_status));
r = -EIO;
break;
default:
log_error("Container %s failed due to unknown reason.",
arg_machine);
r = -1;
log_error("Container %s failed due to unknown reason.", arg_machine);
r = -EIO;
break;
}