From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Tue, 30 Mar 2021 14:29:59 +0000 (+0200)
Subject: systemd-notify: Fix return value of --booted
X-Git-Tag: v249-rc1~485
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ab34a49dbf75fd731973359a6f24c212682f479;p=thirdparty%2Fsystemd.git

systemd-notify: Fix return value of --booted
---

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 40cbc296bd5..99f54ceaaab 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -202,8 +202,15 @@ static int run(int argc, char* argv[]) {
         if (r <= 0)
                 return r;
 
-        if (arg_booted)
-                return sd_booted() <= 0;
+        if (arg_booted) {
+                r = sd_booted();
+                if (r < 0)
+                        log_debug_errno(r, "Failed to determine whether we are booted with systemd, assuming we aren't: %m");
+                else
+                        log_debug("The system %s booted with systemd.", r ? "was" : "was not");
+
+                return r <= 0;
+        }
 
         if (arg_ready)
                 our_env[i++] = (char*) "READY=1";
@@ -278,4 +285,4 @@ static int run(int argc, char* argv[]) {
         return 0;
 }
 
-DEFINE_MAIN_FUNCTION(run);
+DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE (run);