diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-19 03:04:04 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-19 03:04:04 +0200 |
| commit | 5e8d1c9a9f15b7453474dc4879bdb4021c3f50a1 (patch) | |
| tree | ff305b07ce88ea21de22fc86b53c246e40d857c1 /src/manager.c | |
| parent | f9704703f35a281d9f8fa12018bd396b2be30d36 (diff) | |
dbus: to make sure that systemd stays controllable during early bootup, register our services on our own micro usb server in addition to the bus
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/manager.c b/src/manager.c index dee6109c00..456241f6d2 100644 --- a/src/manager.c +++ b/src/manager.c @@ -243,8 +243,7 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { goto fail; /* Try to connect to the busses, if possible. */ - if ((r = bus_init_system(m)) < 0 || - (r = bus_init_api(m)) < 0) + if ((r = bus_init(m)) < 0) goto fail; if (asprintf(&p, "%s/%s", m->cgroup_mount_point, m->cgroup_hierarchy) < 0) { @@ -424,8 +423,7 @@ void manager_free(Manager *m) { * around */ manager_shutdown_cgroup(m, m->exit_code != MANAGER_REEXECUTE); - bus_done_api(m); - bus_done_system(m); + bus_done(m); hashmap_free(m->units); hashmap_free(m->jobs); @@ -1826,8 +1824,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_system(m); - bus_init_api(m); + bus_init(m); } if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) { |