From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Nov 2018 15:58:42 +0000 (+0100)
Subject: nspawn: use EXIT_EXCEPTION where appropriate
X-Git-Tag: v240~261^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2fb2ec942f54c7edd545b3641949c443d83c70d;p=thirdparty%2Fsystemd.git

nspawn: use EXIT_EXCEPTION where appropriate
---

diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
index c83d55cb864..5d17df39d9c 100644
--- a/src/nspawn/nspawn-stub-pid1.c
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -5,6 +5,8 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "def.h"
+#include "exit-status.h"
 #include "fd-util.h"
 #include "log.h"
 #include "missing.h"
@@ -12,7 +14,6 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "time-util.h"
-#include "def.h"
 
 static int reset_environ(const char *new_environment, size_t length) {
         unsigned long start, end;
@@ -122,7 +123,7 @@ int stub_pid1(sd_id128_t uuid) {
                         if (si.si_pid == pid && si.si_code == CLD_EXITED)
                                 r = si.si_status; /* pass on exit code */
                         else
-                                r = 255; /* signal, coredump, timeout, … */
+                                r = EXIT_EXCEPTION; /* signal, coredump, timeout, … */
 
                         goto finish;
                 }