X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Frun%2Frun.c;h=41570bf12ebbea796bf373d8127ab37f267ac712;hb=208a59c15fd41f87248a1a981e558acd3de5e47b;hp=664153137dfdf7685c6198f2d4965bde50ccf4ef;hpb=966f3a246c8c804d8a9c9d393f03c5c3fe0dd393;p=thirdparty%2Fsystemd.git diff --git a/src/run/run.c b/src/run/run.c index 664153137df..41570bf12eb 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -10,6 +10,7 @@ #include "sd-event.h" #include "alloc-util.h" +#include "build.h" #include "bus-error.h" #include "bus-locator.h" #include "bus-map-properties.h" @@ -44,10 +45,11 @@ static const char *arg_unit = NULL; static const char *arg_description = NULL; static const char *arg_slice = NULL; static bool arg_slice_inherit = false; +static bool arg_expand_environment = true; static bool arg_send_sighup = false; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static const char *arg_host = NULL; -static bool arg_user = false; +static RuntimeScope arg_runtime_scope = RUNTIME_SCOPE_SYSTEM; static const char *arg_service_type = NULL; static const char *arg_exec_user = NULL; static const char *arg_exec_group = NULL; @@ -101,6 +103,7 @@ static int help(void) { " --description=TEXT Description for unit\n" " --slice=SLICE Run in the specified slice\n" " --slice-inherit Inherit the slice\n" + " --expand-environment=BOOL Control expansion of environment variables\n" " --no-block Do not wait until operation finished\n" " -r --remain-after-exit Leave service around until explicitly stopped\n" " --wait Wait until service stopped again\n" @@ -167,6 +170,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_DESCRIPTION, ARG_SLICE, ARG_SLICE_INHERIT, + ARG_EXPAND_ENVIRONMENT, ARG_SEND_SIGHUP, ARG_SERVICE_TYPE, ARG_EXEC_USER, @@ -191,47 +195,48 @@ static int parse_argv(int argc, char *argv[]) { }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "user", no_argument, NULL, ARG_USER }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "scope", no_argument, NULL, ARG_SCOPE }, - { "unit", required_argument, NULL, 'u' }, - { "description", required_argument, NULL, ARG_DESCRIPTION }, - { "slice", required_argument, NULL, ARG_SLICE }, - { "slice-inherit", no_argument, NULL, ARG_SLICE_INHERIT }, - { "remain-after-exit", no_argument, NULL, 'r' }, - { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, - { "host", required_argument, NULL, 'H' }, - { "machine", required_argument, NULL, 'M' }, - { "service-type", required_argument, NULL, ARG_SERVICE_TYPE }, - { "wait", no_argument, NULL, ARG_WAIT }, - { "uid", required_argument, NULL, ARG_EXEC_USER }, - { "gid", required_argument, NULL, ARG_EXEC_GROUP }, - { "nice", required_argument, NULL, ARG_NICE }, - { "setenv", required_argument, NULL, 'E' }, - { "property", required_argument, NULL, 'p' }, - { "tty", no_argument, NULL, 't' }, /* deprecated alias */ - { "pty", no_argument, NULL, 't' }, - { "pipe", no_argument, NULL, 'P' }, - { "quiet", no_argument, NULL, 'q' }, - { "on-active", required_argument, NULL, ARG_ON_ACTIVE }, - { "on-boot", required_argument, NULL, ARG_ON_BOOT }, - { "on-startup", required_argument, NULL, ARG_ON_STARTUP }, - { "on-unit-active", required_argument, NULL, ARG_ON_UNIT_ACTIVE }, - { "on-unit-inactive", required_argument, NULL, ARG_ON_UNIT_INACTIVE }, - { "on-calendar", required_argument, NULL, ARG_ON_CALENDAR }, - { "on-timezone-change",no_argument, NULL, ARG_ON_TIMEZONE_CHANGE}, - { "on-clock-change", no_argument, NULL, ARG_ON_CLOCK_CHANGE }, - { "timer-property", required_argument, NULL, ARG_TIMER_PROPERTY }, - { "path-property", required_argument, NULL, ARG_PATH_PROPERTY }, - { "socket-property", required_argument, NULL, ARG_SOCKET_PROPERTY }, - { "no-block", no_argument, NULL, ARG_NO_BLOCK }, - { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, - { "collect", no_argument, NULL, 'G' }, - { "working-directory", required_argument, NULL, ARG_WORKING_DIRECTORY }, - { "same-dir", no_argument, NULL, 'd' }, - { "shell", no_argument, NULL, 'S' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "user", no_argument, NULL, ARG_USER }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "scope", no_argument, NULL, ARG_SCOPE }, + { "unit", required_argument, NULL, 'u' }, + { "description", required_argument, NULL, ARG_DESCRIPTION }, + { "slice", required_argument, NULL, ARG_SLICE }, + { "slice-inherit", no_argument, NULL, ARG_SLICE_INHERIT }, + { "remain-after-exit", no_argument, NULL, 'r' }, + { "expand-environment", required_argument, NULL, ARG_EXPAND_ENVIRONMENT }, + { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, + { "host", required_argument, NULL, 'H' }, + { "machine", required_argument, NULL, 'M' }, + { "service-type", required_argument, NULL, ARG_SERVICE_TYPE }, + { "wait", no_argument, NULL, ARG_WAIT }, + { "uid", required_argument, NULL, ARG_EXEC_USER }, + { "gid", required_argument, NULL, ARG_EXEC_GROUP }, + { "nice", required_argument, NULL, ARG_NICE }, + { "setenv", required_argument, NULL, 'E' }, + { "property", required_argument, NULL, 'p' }, + { "tty", no_argument, NULL, 't' }, /* deprecated alias */ + { "pty", no_argument, NULL, 't' }, + { "pipe", no_argument, NULL, 'P' }, + { "quiet", no_argument, NULL, 'q' }, + { "on-active", required_argument, NULL, ARG_ON_ACTIVE }, + { "on-boot", required_argument, NULL, ARG_ON_BOOT }, + { "on-startup", required_argument, NULL, ARG_ON_STARTUP }, + { "on-unit-active", required_argument, NULL, ARG_ON_UNIT_ACTIVE }, + { "on-unit-inactive", required_argument, NULL, ARG_ON_UNIT_INACTIVE }, + { "on-calendar", required_argument, NULL, ARG_ON_CALENDAR }, + { "on-timezone-change", no_argument, NULL, ARG_ON_TIMEZONE_CHANGE }, + { "on-clock-change", no_argument, NULL, ARG_ON_CLOCK_CHANGE }, + { "timer-property", required_argument, NULL, ARG_TIMER_PROPERTY }, + { "path-property", required_argument, NULL, ARG_PATH_PROPERTY }, + { "socket-property", required_argument, NULL, ARG_SOCKET_PROPERTY }, + { "no-block", no_argument, NULL, ARG_NO_BLOCK }, + { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, + { "collect", no_argument, NULL, 'G' }, + { "working-directory", required_argument, NULL, ARG_WORKING_DIRECTORY }, + { "same-dir", no_argument, NULL, 'd' }, + { "shell", no_argument, NULL, 'S' }, {}, }; @@ -241,6 +246,9 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); + /* Resetting to 0 forces the invocation of an internal initialization routine of getopt_long() + * that checks for GNU extensions in optstring ('-' or '+' at the beginning). */ + optind = 0; while ((c = getopt_long(argc, argv, "+hrH:M:E:p:tPqGdSu:", options, NULL)) >= 0) switch (c) { @@ -256,11 +264,11 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_USER: - arg_user = true; + arg_runtime_scope = RUNTIME_SCOPE_USER; break; case ARG_SYSTEM: - arg_user = false; + arg_runtime_scope = RUNTIME_SCOPE_SYSTEM; break; case ARG_SCOPE: @@ -283,6 +291,12 @@ static int parse_argv(int argc, char *argv[]) { arg_slice_inherit = true; break; + case ARG_EXPAND_ENVIRONMENT: + r = parse_boolean_argument("--expand-environment=", optarg, &arg_expand_environment); + if (r < 0) + return r; + break; + case ARG_SEND_SIGHUP: arg_send_sighup = true; break; @@ -508,7 +522,7 @@ static int parse_argv(int argc, char *argv[]) { } /* If we are talking to the per-user instance PolicyKit isn't going to help */ - if (arg_user) + if (arg_runtime_scope == RUNTIME_SCOPE_USER) arg_ask_password = false; with_trigger = !!arg_path_property || !!arg_socket_property || arg_with_timer; @@ -581,7 +595,7 @@ static int parse_argv(int argc, char *argv[]) { } else if (!arg_unit || !with_trigger) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Command line to execute required."); - if (arg_user && arg_transport == BUS_TRANSPORT_REMOTE) + if (arg_runtime_scope == RUNTIME_SCOPE_USER && arg_transport == BUS_TRANSPORT_REMOTE) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Execution in user context is not supported on remote systems."); @@ -643,11 +657,7 @@ static int transient_unit_set_properties(sd_bus_message *m, UnitType t, char **p return bus_log_create_error(r); } - r = bus_append_unit_property_assignment_many(m, t, properties); - if (r < 0) - return r; - - return 0; + return bus_append_unit_property_assignment_many(m, t, properties); } static int transient_cgroup_set_properties(sd_bus_message *m) { @@ -659,10 +669,20 @@ static int transient_cgroup_set_properties(sd_bus_message *m) { if (arg_slice_inherit) { char *end; - if (arg_user) + switch (arg_runtime_scope) { + + case RUNTIME_SCOPE_USER: r = cg_pid_get_user_slice(0, &name); - else + break; + + case RUNTIME_SCOPE_SYSTEM: r = cg_pid_get_slice(0, &name); + break; + + default: + assert_not_reached(); + } + if (r < 0) return log_error_errno(r, "Failed to get PID slice: %m"); @@ -709,6 +729,11 @@ static int transient_service_set_properties(sd_bus_message *m, const char *pty_p bool send_term = false; int r; + /* We disable environment expansion on the server side via ExecStartEx=:. + * ExecStartEx was added relatively recently (v243), and some bugs were fixed only later. + * So use that feature only if required. It will fail with older systemds. */ + bool use_ex_prop = !arg_expand_environment; + assert(m); r = transient_unit_set_properties(m, UNIT_SERVICE, arg_property); @@ -794,9 +819,12 @@ static int transient_service_set_properties(sd_bus_message *m, const char *pty_p e = getenv("TERM"); if (e) { - char *n; + _cleanup_free_ char *n = NULL; + + n = strjoin("TERM=", e); + if (!n) + return log_oom(); - n = strjoina("TERM=", e); r = sd_bus_message_append(m, "(sv)", "Environment", "as", 1, n); @@ -837,19 +865,23 @@ static int transient_service_set_properties(sd_bus_message *m, const char *pty_p if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_append(m, "s", "ExecStart"); + r = sd_bus_message_append(m, "s", + use_ex_prop ? "ExecStartEx" : "ExecStart"); if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'v', "a(sasb)"); + r = sd_bus_message_open_container(m, 'v', + use_ex_prop ? "a(sasas)" : "a(sasb)"); if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'a', "(sasb)"); + r = sd_bus_message_open_container(m, 'a', + use_ex_prop ? "(sasas)" : "(sasb)"); if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'r', "sasb"); + r = sd_bus_message_open_container(m, 'r', + use_ex_prop ? "sasas" : "sasb"); if (r < 0) return bus_log_create_error(r); @@ -861,7 +893,12 @@ static int transient_service_set_properties(sd_bus_message *m, const char *pty_p if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_append(m, "b", false); + if (use_ex_prop) + r = sd_bus_message_append_strv( + m, + STRV_MAKE(arg_expand_environment ? NULL : "no-env-expand")); + else + r = sd_bus_message_append(m, "b", false); if (r < 0) return bus_log_create_error(r); @@ -1078,10 +1115,9 @@ static int run_context_update(RunContext *c, const char *path) { } static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error *error) { - RunContext *c = userdata; + RunContext *c = ASSERT_PTR(userdata); assert(m); - assert(c); return run_context_update(c, sd_bus_message_get_path(m)); } @@ -1100,19 +1136,86 @@ static int pty_forward_handler(PTYForward *f, int rcode, void *userdata) { return 0; } -static int start_transient_service( +static int make_transient_service_unit( + sd_bus *bus, + sd_bus_message **message, + const char *service, + const char *pty_path) { + + _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; + int r; + + assert(bus); + assert(message); + assert(service); + + r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StartTransientUnit"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_set_allow_interactive_authorization(m, arg_ask_password); + if (r < 0) + return bus_log_create_error(r); + + /* Name and mode */ + r = sd_bus_message_append(m, "ss", service, "fail"); + if (r < 0) + return bus_log_create_error(r); + + /* Properties */ + r = sd_bus_message_open_container(m, 'a', "(sv)"); + if (r < 0) + return bus_log_create_error(r); + + r = transient_service_set_properties(m, pty_path); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + + /* Auxiliary units */ + r = sd_bus_message_append(m, "a(sa(sv))", 0); + if (r < 0) + return bus_log_create_error(r); + + *message = TAKE_PTR(m); + return 0; +} + +static int bus_call_with_hint( sd_bus *bus, - int *retval) { + sd_bus_message *message, + const char *name, + sd_bus_message **reply) { + + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; + int r; + + r = sd_bus_call(bus, message, 0, &error, reply); + if (r < 0) { + log_error_errno(r, "Failed to start transient %s unit: %s", name, bus_error_message(&error, r)); + if (!arg_expand_environment && + sd_bus_error_has_names(&error, + SD_BUS_ERROR_UNKNOWN_PROPERTY, + SD_BUS_ERROR_PROPERTY_READ_ONLY)) + log_notice_errno(r, "Hint: --expand-environment=no is not supported by old systemd"); + } + + return r; +} + +static int start_transient_service(sd_bus *bus) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; _cleanup_free_ char *service = NULL, *pty_path = NULL; - _cleanup_close_ int master = -1; + _cleanup_close_ int master = -EBADF; int r; assert(bus); - assert(retval); if (arg_stdio == ARG_STDIO_PTY) { @@ -1185,42 +1288,15 @@ static int start_transient_service( return r; } - r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StartTransientUnit"); - if (r < 0) - return bus_log_create_error(r); - - r = sd_bus_message_set_allow_interactive_authorization(m, arg_ask_password); - if (r < 0) - return bus_log_create_error(r); - - /* Name and mode */ - r = sd_bus_message_append(m, "ss", service, "fail"); - if (r < 0) - return bus_log_create_error(r); - - /* Properties */ - r = sd_bus_message_open_container(m, 'a', "(sv)"); - if (r < 0) - return bus_log_create_error(r); - - r = transient_service_set_properties(m, pty_path); + r = make_transient_service_unit(bus, &m, service, pty_path); if (r < 0) return r; - r = sd_bus_message_close_container(m); - if (r < 0) - return bus_log_create_error(r); - - /* Auxiliary units */ - r = sd_bus_message_append(m, "a(sa(sv))", 0); - if (r < 0) - return bus_log_create_error(r); - polkit_agent_open_if_enabled(arg_transport, arg_ask_password); - r = sd_bus_call(bus, m, 0, &error, &reply); + r = bus_call_with_hint(bus, m, "service", &reply); if (r < 0) - return log_error_errno(r, "Failed to start transient service unit: %s", bus_error_message(&error, r)); + return r; if (w) { const char *object; @@ -1229,7 +1305,7 @@ static int start_transient_service( if (r < 0) return bus_log_parse_error(r); - r = bus_wait_for_jobs_one(w, object, arg_quiet); + r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_runtime_scope == RUNTIME_SCOPE_USER ? STRV_MAKE_CONST("--user") : NULL); if (r < 0) return r; } @@ -1319,7 +1395,7 @@ static int start_transient_service( log_info("Finished with result: %s", strna(c.result)); if (c.exit_code == CLD_EXITED) - log_info("Main processes terminated with: code=%s/status=%i", + log_info("Main processes terminated with: code=%s/status=%u", sigchld_code_to_string(c.exit_code), c.exit_status); else if (c.exit_code > 0) log_info("Main processes terminated with: code=%s/status=%s", @@ -1351,16 +1427,15 @@ static int start_transient_service( /* Try to propagate the service's return value. But if the service defines * e.g. SuccessExitStatus, honour this, and return 0 to mean "success". */ if (streq_ptr(c.result, "success")) - *retval = 0; - else if (streq_ptr(c.result, "exit-code") && c.exit_status > 0) - *retval = c.exit_status; - else if (streq_ptr(c.result, "signal")) - *retval = EXIT_EXCEPTION; - else - *retval = EXIT_FAILURE; + return EXIT_SUCCESS; + if (streq_ptr(c.result, "exit-code") && c.exit_status > 0) + return c.exit_status; + if (streq_ptr(c.result, "signal")) + return EXIT_EXCEPTION; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } static int acquire_invocation_id(sd_bus *bus, sd_id128_t *ret) { @@ -1399,7 +1474,7 @@ static int start_transient_scope(sd_bus *bus) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL; _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; - _cleanup_strv_free_ char **env = NULL, **user_env = NULL; + _cleanup_strv_free_ char **env = NULL, **user_env = NULL, **expanded_cmdline = NULL; _cleanup_free_ char *scope = NULL; const char *object = NULL; sd_id128_t invocation_id; @@ -1465,7 +1540,7 @@ static int start_transient_scope(sd_bus *bus) { if (r < 0) return bus_log_parse_error(r); - r = bus_wait_for_jobs_one(w, object, arg_quiet); + r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_runtime_scope == RUNTIME_SCOPE_USER ? STRV_MAKE_CONST("--user") : NULL); if (r < 0) return r; @@ -1531,6 +1606,9 @@ static int start_transient_scope(sd_bus *bus) { return log_error_errno(errno, "Failed to change UID to " UID_FMT ": %m", uid); } + if (arg_working_directory && chdir(arg_working_directory) < 0) + return log_error_errno(errno, "Failed to change directory to '%s': %m", arg_working_directory); + env = strv_env_merge(environ, user_env, arg_environment); if (!env) return log_oom(); @@ -1538,75 +1616,33 @@ static int start_transient_scope(sd_bus *bus) { if (!arg_quiet) log_info("Running scope as unit: %s", scope); + if (arg_expand_environment) { + expanded_cmdline = replace_env_argv(arg_cmdline, env); + if (!expanded_cmdline) + return log_oom(); + arg_cmdline = expanded_cmdline; + } + execvpe(arg_cmdline[0], arg_cmdline, env); return log_error_errno(errno, "Failed to execute: %m"); } -static int start_transient_trigger( +static int make_transient_trigger_unit( sd_bus *bus, - const char *suffix) { + sd_bus_message **message, + const char *suffix, + const char *trigger, + const char *service) { - _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL; - _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; - _cleanup_free_ char *trigger = NULL, *service = NULL; - const char *object = NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; int r; assert(bus); - - r = bus_wait_for_jobs_new(bus, &w); - if (r < 0) - return log_oom(); - - if (arg_unit) { - switch (unit_name_to_type(arg_unit)) { - - case UNIT_SERVICE: - service = strdup(arg_unit); - if (!service) - return log_oom(); - - r = unit_name_change_suffix(service, suffix, &trigger); - if (r < 0) - return log_error_errno(r, "Failed to change unit suffix: %m"); - break; - - case UNIT_TIMER: - trigger = strdup(arg_unit); - if (!trigger) - return log_oom(); - - r = unit_name_change_suffix(trigger, ".service", &service); - if (r < 0) - return log_error_errno(r, "Failed to change unit suffix: %m"); - break; - - default: - r = unit_name_mangle_with_suffix(arg_unit, "as unit", - arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, - ".service", &service); - if (r < 0) - return log_error_errno(r, "Failed to mangle unit name: %m"); - - r = unit_name_mangle_with_suffix(arg_unit, "as trigger", - arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, - suffix, &trigger); - if (r < 0) - return log_error_errno(r, "Failed to mangle unit name: %m"); - - break; - } - } else { - r = make_unit_name(bus, UNIT_SERVICE, &service); - if (r < 0) - return r; - - r = unit_name_change_suffix(service, suffix, &trigger); - if (r < 0) - return log_error_errno(r, "Failed to change unit suffix: %m"); - } + assert(message); + assert(suffix); + assert(trigger); + assert(service); r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "StartTransientUnit"); if (r < 0) @@ -1675,17 +1711,87 @@ static int start_transient_trigger( if (r < 0) return bus_log_create_error(r); + *message = TAKE_PTR(m); + return 0; +} + +static int start_transient_trigger(sd_bus *bus, const char *suffix) { + _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL; + _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; + _cleanup_free_ char *trigger = NULL, *service = NULL; + const char *object = NULL; + int r; + + assert(bus); + assert(suffix); + + r = bus_wait_for_jobs_new(bus, &w); + if (r < 0) + return log_oom(); + + if (arg_unit) { + switch (unit_name_to_type(arg_unit)) { + + case UNIT_SERVICE: + service = strdup(arg_unit); + if (!service) + return log_oom(); + + r = unit_name_change_suffix(service, suffix, &trigger); + if (r < 0) + return log_error_errno(r, "Failed to change unit suffix: %m"); + break; + + case UNIT_TIMER: + trigger = strdup(arg_unit); + if (!trigger) + return log_oom(); + + r = unit_name_change_suffix(trigger, ".service", &service); + if (r < 0) + return log_error_errno(r, "Failed to change unit suffix: %m"); + break; + + default: + r = unit_name_mangle_with_suffix(arg_unit, "as unit", + arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, + ".service", &service); + if (r < 0) + return log_error_errno(r, "Failed to mangle unit name: %m"); + + r = unit_name_mangle_with_suffix(arg_unit, "as trigger", + arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, + suffix, &trigger); + if (r < 0) + return log_error_errno(r, "Failed to mangle unit name: %m"); + + break; + } + } else { + r = make_unit_name(bus, UNIT_SERVICE, &service); + if (r < 0) + return r; + + r = unit_name_change_suffix(service, suffix, &trigger); + if (r < 0) + return log_error_errno(r, "Failed to change unit suffix: %m"); + } + + r = make_transient_trigger_unit(bus, &m, suffix, trigger, service); + if (r < 0) + return r; + polkit_agent_open_if_enabled(arg_transport, arg_ask_password); - r = sd_bus_call(bus, m, 0, &error, &reply); + r = bus_call_with_hint(bus, m, suffix + 1, &reply); if (r < 0) - return log_error_errno(r, "Failed to start transient %s unit: %s", suffix + 1, bus_error_message(&error, r)); + return r; r = sd_bus_message_read(reply, "o", &object); if (r < 0) return bus_log_parse_error(r); - r = bus_wait_for_jobs_one(w, object, arg_quiet); + r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_runtime_scope == RUNTIME_SCOPE_USER ? STRV_MAKE_CONST("--user") : NULL); if (r < 0) return r; @@ -1695,13 +1801,26 @@ static int start_transient_trigger( log_info("Will run service as unit: %s", service); } - return 0; + return EXIT_SUCCESS; +} + +static bool shall_make_executable_absolute(void) { + if (strv_isempty(arg_cmdline)) + return false; + if (arg_transport != BUS_TRANSPORT_LOCAL) + return false; + + FOREACH_STRING(f, "RootDirectory=", "RootImage=", "ExecSearchPath=", "MountImages=", "ExtensionImages=") + if (strv_find_startswith(arg_property, f)) + return false; + + return true; } static int run(int argc, char* argv[]) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; _cleanup_free_ char *description = NULL; - int r, retval = EXIT_SUCCESS; + int r; log_show_color(true); log_parse_environment(); @@ -1711,10 +1830,7 @@ static int run(int argc, char* argv[]) { if (r <= 0) return r; - if (!strv_isempty(arg_cmdline) && - arg_transport == BUS_TRANSPORT_LOCAL && - !strv_find_startswith(arg_property, "RootDirectory=") && - !strv_find_startswith(arg_property, "RootImage=")) { + if (shall_make_executable_absolute()) { /* Patch in an absolute path to fail early for user convenience, but only when we can do it * (i.e. we will be running from the same file system). This also uses the user's $PATH, * while we use a fixed search path in the manager. */ @@ -1743,27 +1859,22 @@ static int run(int argc, char* argv[]) { /* If --wait is used connect via the bus, unconditionally, as ref/unref is not supported via the limited direct * connection */ - if (arg_wait || arg_stdio != ARG_STDIO_NONE || (arg_user && arg_transport != BUS_TRANSPORT_LOCAL)) - r = bus_connect_transport(arg_transport, arg_host, arg_user, &bus); + if (arg_wait || arg_stdio != ARG_STDIO_NONE || (arg_runtime_scope == RUNTIME_SCOPE_USER && arg_transport != BUS_TRANSPORT_LOCAL)) + r = bus_connect_transport(arg_transport, arg_host, arg_runtime_scope, &bus); else - r = bus_connect_transport_systemd(arg_transport, arg_host, arg_user, &bus); + r = bus_connect_transport_systemd(arg_transport, arg_host, arg_runtime_scope, &bus); if (r < 0) - return bus_log_connect_error(r); + return bus_log_connect_error(r, arg_transport); if (arg_scope) - r = start_transient_scope(bus); - else if (arg_path_property) - r = start_transient_trigger(bus, ".path"); - else if (arg_socket_property) - r = start_transient_trigger(bus, ".socket"); - else if (arg_with_timer) - r = start_transient_trigger(bus, ".timer"); - else - r = start_transient_service(bus, &retval); - if (r < 0) - return r; - - return retval; + return start_transient_scope(bus); + if (arg_path_property) + return start_transient_trigger(bus, ".path"); + if (arg_socket_property) + return start_transient_trigger(bus, ".socket"); + if (arg_with_timer) + return start_transient_trigger(bus, ".timer"); + return start_transient_service(bus); } DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);