X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=d6b1fcd58102a399f33248e7c66bc086700cda1f;hp=2ae8c27d087a7237b3de9289ece68aa416f78436;hb=ec7f7f20069028ee7acc189255637e42acbd8e32;hpb=385771fcf0e9bda850c5cee765ab70431dbed2fc;ds=sidebyside 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)