From ec7f7f20069028ee7acc189255637e42acbd8e32 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 24 Jul 2010 02:23:40 +0200 Subject: [PATCH] systemctl: don't use the systemd bus to talk to upstart --- src/systemctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/systemctl.c b/src/systemctl.c index 2ae8c27d..d6b1fcd5 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -4516,18 +4516,17 @@ static int reload_with_fallback(DBusConnection *bus) { static int start_with_fallback(DBusConnection *bus) { int r; - if (bus) { /* First, try systemd via D-Bus. */ if ((r = start_unit(bus, NULL, 0)) > 0) goto done; - - /* Hmm, talking to systemd via D-Bus didn't work. Then - * let's try to talk to Upstart via D-Bus. */ - if ((r = talk_upstart()) > 0) - goto done; } + /* Hmm, talking to systemd via D-Bus didn't work. Then + * let's try to talk to Upstart via D-Bus. */ + if ((r = talk_upstart()) > 0) + goto done; + /* Nothing else worked, so let's try * /dev/initctl */ if ((r = talk_initctl()) != 0) -- 2.39.5