dbus: don't try to connect to the system bus before it is actually up

[elogind.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 62847061a27319be99daebe533c49afd0352d20e..013b26b6c965ad95b64ae3334e1cf1a8f74d7d1f 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -259,7 +259,7 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
                 goto fail;
 
         /* Try to connect to the busses, if possible. */
-        if ((r = bus_init(m)) < 0)
+        if ((r = bus_init(m, running_as != MANAGER_SYSTEM)) < 0)
                 goto fail;
 
 #ifdef HAVE_AUDIT
@@ -2102,7 +2102,7 @@ static int manager_process_signal_fd(Manager *m) {
 
                         if (!u || UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u))) {
                                 log_info("Trying to reconnect to bus...");
-                                bus_init(m);
+                                bus_init(m, true);
                         }
 
                         if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) {