From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Aug 2011 01:31:27 +0000 (+0200)
Subject: systemctl: if we managed to reexec the init system via the bus don't retry via signal
X-Git-Tag: v35~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d76702a7b22c85c40c740a63d727a0f114e177ad;p=systemd

systemctl: if we managed to reexec the init system via the bus don't retry via signal

If we managed to reeexec the init system via the bus this allows us to
provide synchronous behaviour to callers. This is all lost if we then
repeat the reexecution via SIGTERM.

https://bugzilla.redhat.com/show_bug.cgi?id=698198
---

diff --git a/src/systemctl.c b/src/systemctl.c
index 0a35d8e0..7caeb6dd 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -5038,7 +5038,7 @@ static int reload_with_fallback(DBusConnection *bus) {
 
         if (bus) {
                 /* First, try systemd via D-Bus. */
-                if (daemon_reload(bus, NULL) > 0)
+                if (daemon_reload(bus, NULL) >= 0)
                         return 0;
         }