chiark / gitweb /
systemctl: if we managed to reexec the init system via the bus don't retry via signal
authorLennart Poettering <lennart@poettering.net>
Wed, 31 Aug 2011 01:31:27 +0000 (03:31 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 31 Aug 2011 01:31:32 +0000 (03:31 +0200)
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

src/systemctl.c

index 0a35d8e..7caeb6d 100644 (file)
@@ -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;
         }