X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frun%2Frun.c;h=7a8022391865aebf329015e6ecab10a93e16ef8a;hp=e5a62d9e35a278f437100374b0400078599f2f32;hb=4c213d6cf416917c61f82d8bee795b8f3a4c5372;hpb=c221420be8744bb0f8b8a8145efc1f247f1aa801 diff --git a/src/run/run.c b/src/run/run.c index e5a62d9e3..7a8022391 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -23,32 +23,74 @@ #include #include "sd-bus.h" -#include "bus-internal.h" -#include "bus-message.h" +#include "bus-util.h" #include "strv.h" #include "build.h" #include "unit-name.h" +#include "env-util.h" +#include "path-util.h" +#include "bus-error.h" +#include "calendarspec.h" static bool arg_scope = false; -static bool arg_user = false; +static bool arg_remain_after_exit = false; static const char *arg_unit = NULL; static const char *arg_description = NULL; static const char *arg_slice = NULL; - -static int help(void) { - - printf("%s [OPTIONS...] [COMMAND LINE...]\n\n" - "Notify the init system about service status updates.\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --user Run as user unit\n" - " --scope Run this as scope rather than service\n" - " --unit=UNIT Run under the specified unit name\n" - " --description=TEXT Description for unit\n" - " --slice=SLICE Run in the specified slice\n", +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 const char *arg_service_type = NULL; +static const char *arg_exec_user = NULL; +static const char *arg_exec_group = NULL; +static int arg_nice = 0; +static bool arg_nice_set = false; +static char **arg_environment = NULL; +static char **arg_property = NULL; +static usec_t arg_on_active = 0; +static usec_t arg_on_boot = 0; +static usec_t arg_on_startup = 0; +static usec_t arg_on_unit_active = 0; +static usec_t arg_on_unit_inactive = 0; +static char *arg_on_calendar = NULL; +static char **arg_timer_property = NULL; + +static void help(void) { + printf("%s [OPTIONS...] {COMMAND} [ARGS...]\n\n" + "Run the specified command in a transient scope or service or timer\n" + "unit. If timer option is specified and unit is exist which is\n" + "specified with --unit option then command can be ommited.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --user Run as user unit\n" + " -H --host=[USER@]HOST Operate on remote host\n" + " -M --machine=CONTAINER Operate on local container\n" + " --scope Run this as scope rather than service\n" + " --unit=UNIT Run under the specified unit name\n" + " -p --property=NAME=VALUE Set unit property\n" + " --description=TEXT Description for unit\n" + " --slice=SLICE Run in the specified slice\n" + " -r --remain-after-exit Leave service around until explicitly stopped\n" + " --send-sighup Send SIGHUP when terminating\n" + " --service-type=TYPE Service type\n" + " --uid=USER Run as system user\n" + " --gid=GROUP Run as system group\n" + " --nice=NICE Nice level\n" + " --setenv=NAME=VALUE Set environment\n\n" + "Timer options:\n\n" + " --on-active=SEC Run after seconds\n" + " --on-boot=SEC Run after seconds from machine was booted up\n" + " --on-startup=SEC Run after seconds from systemd was first started\n" + " --on-unit-active=SEC Run after seconds from the last activation\n" + " --on-unit-inactive=SEC Run after seconds from the last deactivation\n" + " --on-calendar=SPEC Realtime timer\n" + " --timer-property=NAME=VALUE Set timer unit property\n", program_invocation_short_name); +} - return 0; +static bool with_timer(void) { + return arg_on_active || arg_on_boot || arg_on_startup || arg_on_unit_active || arg_on_unit_inactive || arg_on_calendar; } static int parse_argv(int argc, char *argv[]) { @@ -56,29 +98,62 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_USER, + ARG_SYSTEM, ARG_SCOPE, ARG_UNIT, ARG_DESCRIPTION, - ARG_SLICE + ARG_SLICE, + ARG_SEND_SIGHUP, + ARG_EXEC_USER, + ARG_EXEC_GROUP, + ARG_SERVICE_TYPE, + ARG_NICE, + ARG_SETENV, + ARG_ON_ACTIVE, + ARG_ON_BOOT, + ARG_ON_STARTUP, + ARG_ON_UNIT_ACTIVE, + ARG_ON_UNIT_INACTIVE, + ARG_ON_CALENDAR, + ARG_TIMER_PROPERTY }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "user", no_argument, NULL, ARG_USER }, - { "scope", no_argument, NULL, ARG_SCOPE }, - { "unit", required_argument, NULL, ARG_UNIT }, - { "description", required_argument, NULL, ARG_DESCRIPTION }, - { "slice", required_argument, NULL, ARG_SLICE }, - { NULL, 0, NULL, 0 }, + { "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, ARG_UNIT }, + { "description", required_argument, NULL, ARG_DESCRIPTION }, + { "slice", required_argument, NULL, ARG_SLICE }, + { "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 }, + { "uid", required_argument, NULL, ARG_EXEC_USER }, + { "gid", required_argument, NULL, ARG_EXEC_GROUP }, + { "nice", required_argument, NULL, ARG_NICE }, + { "setenv", required_argument, NULL, ARG_SETENV }, + { "property", required_argument, NULL, 'p' }, + { "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 }, + { "timer-property", required_argument, NULL, ARG_TIMER_PROPERTY }, + {}, }; - int c; + int r, c; + CalendarSpec *spec = NULL; assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hrH:M:p:", options, NULL)) >= 0) switch (c) { @@ -95,6 +170,10 @@ static int parse_argv(int argc, char *argv[]) { arg_user = true; break; + case ARG_SYSTEM: + arg_user = false; + break; + case ARG_SCOPE: arg_scope = true; break; @@ -111,45 +190,188 @@ static int parse_argv(int argc, char *argv[]) { arg_slice = optarg; break; + case ARG_SEND_SIGHUP: + arg_send_sighup = true; + break; + + case 'r': + arg_remain_after_exit = true; + break; + + case 'H': + arg_transport = BUS_TRANSPORT_REMOTE; + arg_host = optarg; + break; + + case 'M': + arg_transport = BUS_TRANSPORT_CONTAINER; + arg_host = optarg; + break; + + case ARG_SERVICE_TYPE: + arg_service_type = optarg; + break; + + case ARG_EXEC_USER: + arg_exec_user = optarg; + break; + + case ARG_EXEC_GROUP: + arg_exec_group = optarg; + break; + + case ARG_NICE: + r = safe_atoi(optarg, &arg_nice); + if (r < 0 || arg_nice < PRIO_MIN || arg_nice >= PRIO_MAX) { + log_error("Failed to parse nice value"); + return -EINVAL; + } + + arg_nice_set = true; + break; + + case ARG_SETENV: + + if (strv_extend(&arg_environment, optarg) < 0) + return log_oom(); + + break; + + case 'p': + + if (strv_extend(&arg_property, optarg) < 0) + return log_oom(); + + break; + + case ARG_ON_ACTIVE: + + r = parse_sec(optarg, &arg_on_active); + if (r < 0) { + log_error("Failed to parse timer value: %s", optarg); + return r; + } + + break; + + case ARG_ON_BOOT: + + r = parse_sec(optarg, &arg_on_boot); + if (r < 0) { + log_error("Failed to parse timer value: %s", optarg); + return r; + } + + break; + + case ARG_ON_STARTUP: + + r = parse_sec(optarg, &arg_on_startup); + if (r < 0) { + log_error("Failed to parse timer value: %s", optarg); + return r; + } + + break; + + case ARG_ON_UNIT_ACTIVE: + + r = parse_sec(optarg, &arg_on_unit_active); + if (r < 0) { + log_error("Failed to parse timer value: %s", optarg); + return r; + } + + break; + + case ARG_ON_UNIT_INACTIVE: + + r = parse_sec(optarg, &arg_on_unit_inactive); + if (r < 0) { + log_error("Failed to parse timer value: %s", optarg); + return r; + } + + break; + + case ARG_ON_CALENDAR: + + r = calendar_spec_from_string(optarg, &spec); + if (r < 0) { + log_error("Invalid calendar spec: %s", optarg); + return r; + } + free(spec); + arg_on_calendar = optarg; + break; + + case ARG_TIMER_PROPERTY: + + if (strv_extend(&arg_timer_property, optarg) < 0) + return log_oom(); + + break; + case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } - } - if (optind >= argc) { + if ((optind >= argc) && (!arg_unit || !with_timer())) { log_error("Command line to execute required."); return -EINVAL; } + if (arg_user && arg_transport != BUS_TRANSPORT_LOCAL) { + log_error("Execution in user context is not supported on non-local systems."); + return -EINVAL; + } + + if (arg_scope && arg_transport != BUS_TRANSPORT_LOCAL) { + log_error("Scope execution is not supported on non-local systems."); + return -EINVAL; + } + + if (arg_scope && (arg_remain_after_exit || arg_service_type)) { + log_error("--remain-after-exit and --service-type= are not supported in --scope mode."); + return -EINVAL; + } + + if (arg_scope && with_timer()) { + log_error("Timer options are not supported in --scope mode."); + return -EINVAL; + } + + if (arg_timer_property && !with_timer()) { + log_error("--timer-property= has no effect without any other timer options."); + return -EINVAL; + } + return 1; } -static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bus_message **ret) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; +static int transient_unit_set_properties(sd_bus_message *m, UnitType t) { + char **i; int r; - log_info("Running as unit %s.", name); - - r = sd_bus_message_new_method_call( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartTransientUnit", &m); - if (r < 0) - return r; + STRV_FOREACH(i, t == UNIT_TIMER ? arg_timer_property : arg_property) { + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + return r; - r = sd_bus_message_append(m, "ss", name, "fail"); - if (r < 0) - return r; + r = bus_append_unit_property_assignment(m, *i); + if (r < 0) { + r = sd_bus_message_append(m, "sv", 0); + if (r < 0) + return r; + } - r = sd_bus_message_open_container(m, 'a', "(sv)"); - if (r < 0) - return r; + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } r = sd_bus_message_append(m, "(sv)", "Description", "s", arg_description); if (r < 0) @@ -158,7 +380,7 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu if (!isempty(arg_slice)) { _cleanup_free_ char *slice; - slice = unit_name_mangle_with_suffix(arg_slice, ".slice"); + slice = unit_name_mangle_with_suffix(arg_slice, MANGLE_NOGLOB, ".slice"); if (!slice) return -ENOMEM; @@ -167,20 +389,196 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu return r; } - *ret = m; - m = NULL; + if (arg_send_sighup && t != UNIT_TIMER) { + r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup); + if (r < 0) + return r; + } return 0; } -static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_bus_error *error, sd_bus_message **reply) { +static int transient_service_set_properties(sd_bus_message *m, char **argv) { int r; - r = sd_bus_message_close_container(m); + assert(m); + + r = transient_unit_set_properties(m, UNIT_SERVICE); + if (r < 0) + return r; + + if (arg_remain_after_exit) { + r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit); + if (r < 0) + return r; + } + + if (arg_service_type) { + r = sd_bus_message_append(m, "(sv)", "Type", "s", arg_service_type); + if (r < 0) + return r; + } + + if (arg_exec_user) { + r = sd_bus_message_append(m, "(sv)", "User", "s", arg_exec_user); + if (r < 0) + return r; + } + + if (arg_exec_group) { + r = sd_bus_message_append(m, "(sv)", "Group", "s", arg_exec_group); + if (r < 0) + return r; + } + + if (arg_nice_set) { + r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice); + if (r < 0) + return r; + } + + if (!strv_isempty(arg_environment)) { + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", "Environment"); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'v', "as"); + if (r < 0) + return r; + + r = sd_bus_message_append_strv(m, arg_environment); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } + + /* Exec container */ + { + r = sd_bus_message_open_container(m, 'r', "sv"); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", "ExecStart"); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'v', "a(sasb)"); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'a', "(sasb)"); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'r', "sasb"); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", argv[0]); + if (r < 0) + return r; + + r = sd_bus_message_append_strv(m, argv); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "b", false); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } + + return 0; +} + +static int transient_timer_set_properties(sd_bus_message *m) { + int r; + + assert(m); + + r = transient_unit_set_properties(m, UNIT_TIMER); + if (r < 0) + return r; + + if (arg_on_active) { + r = sd_bus_message_append(m, "(sv)", "OnActiveSec", "t", arg_on_active); + if (r < 0) + return r; + } + + if (arg_on_boot) { + r = sd_bus_message_append(m, "(sv)", "OnBootSec", "t", arg_on_boot); + if (r < 0) + return r; + } + + if (arg_on_startup) { + r = sd_bus_message_append(m, "(sv)", "OnStartupSec", "t", arg_on_startup); + if (r < 0) + return r; + } + + if (arg_on_unit_active) { + r = sd_bus_message_append(m, "(sv)", "OnUnitActiveSec", "t", arg_on_unit_active); + if (r < 0) + return r; + } + + if (arg_on_unit_inactive) { + r = sd_bus_message_append(m, "(sv)", "OnUnitInactiveSec", "t", arg_on_unit_inactive); + if (r < 0) + return r; + } + + if (arg_on_calendar) { + r = sd_bus_message_append(m, "(sv)", "OnCalendar", "s", arg_on_calendar); + if (r < 0) + return r; + } + + return 0; +} + +static int transient_scope_set_properties(sd_bus_message *m) { + int r; + + assert(m); + + r = transient_unit_set_properties(m, UNIT_SCOPE); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid()); if (r < 0) return r; - return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); + return 0; } static int start_transient_service( @@ -188,81 +586,182 @@ static int start_transient_service( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; - _cleanup_free_ char *name = NULL; - char **i; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + _cleanup_free_ char *service = NULL; int r; - if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".service"); - else - asprintf(&name, "run-%lu.service", (unsigned long) getpid()); - if (!name) - return -ENOMEM; + assert(bus); + assert(argv); - r = message_start_transient_unit_new(bus, name, &m); - if (r < 0) - return r; + if (arg_unit) { + service = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service"); + if (!service) + return log_oom(); + } else if (asprintf(&service, "run-"PID_FMT".service", getpid()) < 0) + return log_oom(); - r = sd_bus_message_open_container(m, 'r', "sv"); + r = sd_bus_message_new_method_call( + bus, + &m, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartTransientUnit"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_append(m, "s", "ExecStart"); + /* name and mode */ + r = sd_bus_message_append(m, "ss", service, "fail"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'v', "a(sasb)"); + /* properties */ + r = sd_bus_message_open_container(m, 'a', "(sv)"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'a', "(sasb)"); + r = transient_service_set_properties(m, argv); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'r', "sasb"); + r = sd_bus_message_close_container(m); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_append(m, "s", argv[0]); + /* aux */ + r = sd_bus_message_append(m, "a(sa(sv))", 0); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_open_container(m, 'a', "s"); + /* send dbus */ + r = sd_bus_call(bus, m, 0, error, NULL); if (r < 0) - return r; + return bus_log_create_error(r); - STRV_FOREACH(i, argv) { - r = sd_bus_message_append(m, "s", *i); - if (r < 0) - return r; - } + log_info("Running as unit %s.", service); - r = sd_bus_message_close_container(m); + return 0; +} + +static int start_transient_timer( + sd_bus *bus, + char **argv, + sd_bus_error *error) { + + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + _cleanup_free_ char *timer = NULL, *service = NULL; + int r; + + assert(bus); + assert(argv); + + if (arg_unit) { + switch(unit_name_to_type(arg_unit)) { + case UNIT_SERVICE: + service = strdup(arg_unit); + timer = unit_name_change_suffix(service, ".timer"); + if (!timer) + return log_oom(); + break; + + case UNIT_TIMER: + timer = strdup(arg_unit); + service = unit_name_change_suffix(timer, ".service"); + if (!service) + return log_oom(); + break; + + default: + service = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service"); + if (!service) + return log_oom(); + + timer = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".timer"); + if (!timer) + return log_oom(); + + break; + } + } else if ((asprintf(&service, "run-"PID_FMT".service", getpid()) < 0) || + (asprintf(&timer, "run-"PID_FMT".timer", getpid()) < 0)) + return log_oom(); + + r = sd_bus_message_new_method_call( + bus, + &m, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartTransientUnit"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_append(m, "b", false); + /* name and mode */ + r = sd_bus_message_append(m, "ss", timer, "fail"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_close_container(m); + /* properties */ + r = sd_bus_message_open_container(m, 'a', "(sv)"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_close_container(m); + r = transient_timer_set_properties(m); if (r < 0) - return r; + return bus_log_create_error(r); r = sd_bus_message_close_container(m); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_close_container(m); + if (argv[0]) { + r = sd_bus_message_open_container(m, 'a', "(sa(sv))"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_open_container(m, 'r', "sa(sv)"); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_append(m, "s", service); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_open_container(m, 'a', "(sv)"); + if (r < 0) + return bus_log_create_error(r); + + r = transient_service_set_properties(m, argv); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + } else { + r = sd_bus_message_append(m, "a(sa(sv))", 0); + if (r < 0) + return bus_log_create_error(r); + } + + /* send dbus */ + r = sd_bus_call(bus, m, 0, error, NULL); if (r < 0) - return r; + return bus_log_create_error(r); + + log_info("Running as unit %s.", timer); + if (argv[0]) + log_info("Will run as unit %s.", service); - return message_start_transient_unit_send(bus, m, error, &reply); + return 0; } static int start_transient_scope( @@ -270,38 +769,124 @@ static int start_transient_scope( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; - _cleanup_free_ char *name = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + _cleanup_free_ char *scope = NULL; + _cleanup_strv_free_ char **env = NULL, **user_env = NULL; int r; - if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".scope"); - else - asprintf(&name, "run-%lu.scope", (unsigned long) getpid()); - if (!name) - return -ENOMEM; + assert(bus); + assert(argv); - r = message_start_transient_unit_new(bus, name, &m); + if (arg_unit) { + scope = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope"); + if (!scope) + return log_oom(); + } else if (asprintf(&scope, "run-"PID_FMT".scope", getpid()) < 0) + return log_oom(); + + r = sd_bus_message_new_method_call( + bus, + &m, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartTransientUnit"); if (r < 0) - return r; + return bus_log_create_error(r); - r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid()); + /* name and mode */ + r = sd_bus_message_append(m, "ss", scope, "fail"); if (r < 0) - return r; + return bus_log_create_error(r); - r = message_start_transient_unit_send(bus, m, error, &reply); + /* properties */ + r = sd_bus_message_open_container(m, 'a', "(sv)"); if (r < 0) - return r; + return bus_log_create_error(r); + + r = transient_scope_set_properties(m); + if (r < 0) + return bus_log_create_error(r); + + r = sd_bus_message_close_container(m); + if (r < 0) + return bus_log_create_error(r); + + /* aux */ + r = sd_bus_message_append(m, "a(sa(sv))", 0); + if (r < 0) + return bus_log_create_error(r); + + /* send dbus */ + r = sd_bus_call(bus, m, 0, error, NULL); + if (r < 0) + return bus_log_create_error(r); + + if (arg_nice_set) { + if (setpriority(PRIO_PROCESS, 0, arg_nice) < 0) + return log_error_errno(errno, "Failed to set nice level: %m"); + } + + if (arg_exec_group) { + gid_t gid; + + r = get_group_creds(&arg_exec_group, &gid); + if (r < 0) + return log_error_errno(r, "Failed to resolve group %s: %m", arg_exec_group); + + if (setresgid(gid, gid, gid) < 0) + return log_error_errno(errno, "Failed to change GID to " GID_FMT ": %m", gid); + } + + if (arg_exec_user) { + const char *home, *shell; + uid_t uid; + gid_t gid; + + r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell); + if (r < 0) + return log_error_errno(r, "Failed to resolve user %s: %m", arg_exec_user); + + r = strv_extendf(&user_env, "HOME=%s", home); + if (r < 0) + return log_oom(); + + r = strv_extendf(&user_env, "SHELL=%s", shell); + if (r < 0) + return log_oom(); + + r = strv_extendf(&user_env, "USER=%s", arg_exec_user); + if (r < 0) + return log_oom(); + + r = strv_extendf(&user_env, "LOGNAME=%s", arg_exec_user); + if (r < 0) + return log_oom(); + + if (!arg_exec_group) { + if (setresgid(gid, gid, gid) < 0) + return log_error_errno(errno, "Failed to change GID to " GID_FMT ": %m", gid); + } + + if (setresuid(uid, uid, uid) < 0) + return log_error_errno(errno, "Failed to change UID to " UID_FMT ": %m", uid); + } - execvp(argv[0], argv); - log_error("Failed to execute: %m"); + env = strv_env_merge(3, environ, user_env, arg_environment); + if (!env) + return log_oom(); + + log_info("Running as unit %s.", scope); + + execvpe(argv[0], argv, env); + log_error_errno(errno, "Failed to execute: %m"); return -errno; } int main(int argc, char* argv[]) { - sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; - _cleanup_free_ char *description = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; + _cleanup_free_ char *description = NULL, *command = NULL; int r; log_parse_environment(); @@ -309,37 +894,56 @@ int main(int argc, char* argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto fail; + goto finish; + + if (argc > optind) { + r = find_binary(argv[optind], arg_transport == BUS_TRANSPORT_LOCAL, &command); + if (r < 0) { + log_error_errno(r, "Failed to find executable %s%s: %m", + argv[optind], + arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system"); + goto finish; + } + argv[optind] = command; + } if (!arg_description) { description = strv_join(argv + optind, " "); if (!description) { r = log_oom(); - goto fail; + goto finish; + } + + if (arg_unit && isempty(description)) { + free(description); + description = strdup(arg_unit); + + if (!description) { + r = log_oom(); + goto finish; + } } arg_description = description; } - if (arg_user) - r = sd_bus_open_user(&bus); - else - r = sd_bus_open_system(&bus); + r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); if (r < 0) { - log_error("Failed to create new bus connection: %s", strerror(-r)); - goto fail; + log_error_errno(r, "Failed to create bus connection: %m"); + goto finish; } if (arg_scope) r = start_transient_scope(bus, argv + optind, &error); + else if (with_timer()) + r = start_transient_timer(bus, argv + optind, &error); else r = start_transient_service(bus, argv + optind, &error); - if (r < 0) { - log_error("Failed start transient unit: %s", error.message ? error.message : strerror(-r)); - sd_bus_error_free(&error); - goto fail; - } -fail: +finish: + strv_free(arg_environment); + strv_free(arg_property); + strv_free(arg_timer_property); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }