X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frun%2Frun.c;h=18a4920f0371fd91bb5d1c0e3e775241554e73f6;hp=b45116870c6dd10f7ed0785a2d60b7c09ba57a30;hb=cac914e643a50c72893c5478f6886e0978f8fa18;hpb=6c12b52e19640747e96f89d85422941a23dc6b29 diff --git a/src/run/run.c b/src/run/run.c index b45116870..18a4920f0 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -28,20 +28,29 @@ #include "strv.h" #include "build.h" #include "unit-name.h" +#include "path-util.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 bool arg_send_sighup = false; 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", + printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n" + "Run the specified command in a transient scope or service unit.\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" + " -r --remain-after-exit Leave service around until explicitly stopped\n" + " --send-sighup Send SIGHUP when terminating\n", program_invocation_short_name); return 0; @@ -53,16 +62,23 @@ static int parse_argv(int argc, char *argv[]) { ARG_VERSION = 0x100, ARG_USER, ARG_SCOPE, - ARG_UNIT + ARG_UNIT, + ARG_DESCRIPTION, + ARG_SLICE, + ARG_SEND_SIGHUP, }; 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 }, - { NULL, 0, NULL, 0 } + { "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 }, + { "remain-after-exit", no_argument, NULL, 'r' }, + { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, + { NULL, 0, NULL, 0 }, }; int c; @@ -70,7 +86,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hr", options, NULL)) >= 0) { switch (c) { @@ -95,6 +111,22 @@ static int parse_argv(int argc, char *argv[]) { arg_unit = optarg; break; + case ARG_DESCRIPTION: + arg_description = optarg; + break; + + case ARG_SLICE: + arg_slice = optarg; + break; + + case ARG_SEND_SIGHUP: + arg_send_sighup = true; + break; + + case 'r': + arg_remain_after_exit = true; + break; + case '?': return -EINVAL; @@ -135,7 +167,23 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu if (r < 0) return r; - r = sd_bus_message_open_container(m, 'r', "sv"); + r = sd_bus_message_append(m, "(sv)", "Description", "s", arg_description); + if (r < 0) + return r; + + if (!isempty(arg_slice)) { + _cleanup_free_ char *slice; + + slice = unit_name_mangle_with_suffix(arg_slice, ".slice"); + if (!slice) + return -ENOMEM; + + r = sd_bus_message_append(m, "(sv)", "Slice", "s", slice); + if (r < 0) + return r; + } + + r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup); if (r < 0) return r; @@ -148,10 +196,6 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu static int message_start_transient_unit_send(sd_bus *bus, sd_bus_message *m, sd_bus_error *error, sd_bus_message **reply) { int 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; @@ -180,6 +224,14 @@ static int start_transient_service( if (r < 0) return r; + r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit); + if (r < 0) + return r; + + 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; @@ -230,6 +282,10 @@ static int start_transient_service( if (r < 0) return r; + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + return message_start_transient_unit_send(bus, m, error, &reply); } @@ -253,7 +309,7 @@ static int start_transient_scope( if (r < 0) return r; - r = sd_bus_message_append(m, "sv", "PIDs", "au", 1, (uint32_t) getpid()); + r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid()); if (r < 0) return r; @@ -269,6 +325,7 @@ static int start_transient_scope( 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, *command = NULL; int r; log_parse_environment(); @@ -278,6 +335,23 @@ int main(int argc, char* argv[]) { if (r <= 0) goto fail; + r = find_binary(argv[optind], &command); + if (r < 0) { + log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); + goto fail; + } + argv[optind] = command; + + if (!arg_description) { + description = strv_join(argv + optind, " "); + if (!description) { + r = log_oom(); + goto fail; + } + + arg_description = description; + } + if (arg_user) r = sd_bus_open_user(&bus); else @@ -292,7 +366,7 @@ int main(int argc, char* argv[]) { else r = start_transient_service(bus, argv + optind, &error); if (r < 0) { - log_error("Failed start transient unit: %s", error.message); + log_error("Failed start transient unit: %s", error.message ? error.message : strerror(-r)); sd_bus_error_free(&error); goto fail; }