From 92cb8ebcb491939dbf55e7e8de7344e2342336a8 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sat, 2 May 2020 23:11:33 -0700 Subject: mount: switch to BusLocator-oriented helpers Mechanical substitution reducing some verbosity --- src/mount/mount-tool.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'src/mount') diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 982e0a285e..469c14271c 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -551,13 +551,7 @@ static int start_transient_mount( if (r < 0) return log_error_errno(r, "Failed to make mount unit name: %m"); - r = sd_bus_message_new_method_call( - bus, - &m, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartTransientUnit"); + r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StartTransientUnit"); if (r < 0) return bus_log_create_error(r); @@ -638,13 +632,7 @@ static int start_transient_automount( if (r < 0) return log_error_errno(r, "Failed to make mount unit name: %m"); - r = sd_bus_message_new_method_call( - bus, - &m, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartTransientUnit"); + r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StartTransientUnit"); if (r < 0) return bus_log_create_error(r); @@ -854,13 +842,7 @@ static int stop_mount( if (r < 0) return log_error_errno(r, "Failed to make %s unit name from path %s: %m", suffix + 1, where); - r = sd_bus_message_new_method_call( - bus, - &m, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StopUnit"); + r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StopUnit"); if (r < 0) return bus_log_create_error(r); -- cgit v1.2.3