diff options
| author | gtwang01 <110636181+gtwang01@users.noreply.github.com> | 2022-08-09 00:19:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 16:19:09 +0900 |
| commit | b607fd3f32c3ef36795a5bce92ec7f31c48bc9d9 (patch) | |
| tree | c7167e8510fbb4d8dd4954ffeee1aff19709c0a4 /src/sulogin-shell | |
| parent | 5ed47c4d230b9491339c16c6ea4181dfd293bc98 (diff) | |
| download | systemd-b607fd3f32c3ef36795a5bce92ec7f31c48bc9d9.tar.gz | |
tree-wide: use bus locator (#24252)
This modifies some sd_bus calls to equivalent bus calls.
Diffstat (limited to 'src/sulogin-shell')
| -rw-r--r-- | src/sulogin-shell/sulogin-shell.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index 148e8acd73..06f17c6a8e 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -8,6 +8,7 @@ #include "sd-bus.h" +#include "bus-locator.h" #include "bus-util.h" #include "bus-error.h" #include "def.h" @@ -24,12 +25,10 @@ static int reload_manager(sd_bus *bus) { log_info("Reloading system manager configuration"); - r = sd_bus_message_new_method_call( + r = bus_message_new_method_call( bus, &m, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", + bus_systemd_mgr, "Reload"); if (r < 0) return bus_log_create_error(r); @@ -52,14 +51,13 @@ static int start_default_target(sd_bus *bus) { log_info("Starting "SPECIAL_DEFAULT_TARGET); /* Start this unit only if we can replace basic.target with it */ - r = sd_bus_call_method(bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartUnit", - &error, - NULL, - "ss", SPECIAL_DEFAULT_TARGET, "isolate"); + r = bus_call_method( + bus, + bus_systemd_mgr, + "StartUnit", + &error, + NULL, + "ss", SPECIAL_DEFAULT_TARGET, "isolate"); if (r < 0) return log_error_errno(r, "Failed to start "SPECIAL_DEFAULT_TARGET": %s", bus_error_message(&error, r)); |