summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-24 02:23:40 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-24 02:23:40 +0200
commitec7f7f20069028ee7acc189255637e42acbd8e32 (patch)
tree6613a3e3a17ec363574fd9879a7172260d047316
parent385771fcf0e9bda850c5cee765ab70431dbed2fc (diff)
systemctl: don't use the systemd bus to talk to upstart
-rw-r--r--src/systemctl.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/systemctl.c b/src/systemctl.c
index 2ae8c27d0..d6b1fcd58 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)