summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-08-31 03:31:27 +0200
committerLennart Poettering <lennart@poettering.net>2011-08-31 03:31:32 +0200
commitd76702a7b22c85c40c740a63d727a0f114e177ad (patch)
treef5ded15b47840ff4f02788068a5613a03992bdc5
parentlogind: use syspath instead of sysname to identify fb devices since udlfb got... (diff)
downloadsystemd-d76702a7b22c85c40c740a63d727a0f114e177ad.tar.xz
systemd-d76702a7b22c85c40c740a63d727a0f114e177ad.zip
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
-rw-r--r--src/systemctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systemctl.c b/src/systemctl.c
index 0a35d8e021..7caeb6dd91 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;
}