diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-24 02:23:40 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-24 02:23:40 +0200 |
| commit | ec7f7f20069028ee7acc189255637e42acbd8e32 (patch) | |
| tree | 6613a3e3a17ec363574fd9879a7172260d047316 /src/systemctl.c | |
| parent | 385771fcf0e9bda850c5cee765ab70431dbed2fc (diff) | |
systemctl: don't use the systemd bus to talk to upstart
Diffstat (limited to 'src/systemctl.c')
| -rw-r--r-- | src/systemctl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/systemctl.c b/src/systemctl.c index 2ae8c27d08..d6b1fcd581 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) |