From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Apr 2016 15:41:48 +0000 (+0200)
Subject: systemctl: add error message when we get unexpected event from waitid()
X-Git-Tag: v230~185^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c61b443d32ceea2d0a8c46c1d61a9314f1affa89;p=thirdparty%2Fsystemd.git

systemctl: add error message when we get unexpected event from waitid()

We should log about everything we don't expect.

Also, add a comment for one case were we do not log, on purpose, and make it
use a separate error code.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d3e9ccfbd51..7c259ba06f1 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5340,9 +5340,11 @@ static int enable_sysv_units(const char *verb, char **args) {
                                 }
 
                         } else if (status.si_status != 0)
-                                return -EINVAL;
-                } else
+                                return -EBADE; /* We don't warn here, under the assumption the script already showed an explanation */
+                } else {
+                        log_error("Unexpected waitid() result.");
                         return -EPROTO;
+                }
 
                 if (found_native)
                         continue;
@@ -5413,8 +5415,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
         if (r < 0)
                 return r;
 
-        /* If the operation was fully executed by the SysV compat,
-         * let's finish early */
+        /* If the operation was fully executed by the SysV compat, let's finish early */
         if (strv_isempty(names))
                 return 0;