diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-01-20 19:43:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-01-20 19:43:38 +0100 |
| commit | 3996fbe2a2a212d9ac983950602cc09db55d77ef (patch) | |
| tree | 8ba6323f1875c005ac310f2d12c95ba912a6630e /src/manager.c | |
| parent | 867b3b7d6b88ba4d07ec7c830576d4ac2f7dd226 (diff) | |
dbus: don't try to connect to the system bus before it is actually up
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/manager.c b/src/manager.c index 62847061a2..013b26b6c9 100644 --- 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))) { |