X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frun%2Frun.c;h=ef2015fe3c3e753d7cc5f622c63b164550c43819;hp=fc7a3fc521ecfb85f1d9e98b3f340378874e3bb0;hb=e3e0314b56012f7febc279d268f2cadc1fcc0f25;hpb=d21ed1ead18d16d35c30299a69d3366847f8a039 diff --git a/src/run/run.c b/src/run/run.c index fc7a3fc52..ef2015fe3 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -28,6 +28,7 @@ #include "build.h" #include "unit-name.h" #include "path-util.h" +#include "bus-error.h" static bool arg_scope = false; static bool arg_remain_after_exit = false; @@ -46,8 +47,8 @@ static int help(void) { " -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" + " -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" " --description=TEXT Description for unit\n" @@ -64,6 +65,7 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_USER, + ARG_SYSTEM, ARG_SCOPE, ARG_UNIT, ARG_DESCRIPTION, @@ -75,6 +77,7 @@ static int parse_argv(int argc, char *argv[]) { { "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 }, @@ -83,7 +86,7 @@ static int parse_argv(int argc, char *argv[]) { { "send-sighup", no_argument, NULL, ARG_SEND_SIGHUP }, { "host", required_argument, NULL, 'H' }, { "machine", required_argument, NULL, 'M' }, - { NULL, 0, NULL, 0 }, + {}, }; int c; @@ -96,8 +99,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -108,6 +110,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; @@ -146,8 +152,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } @@ -173,6 +178,10 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; + assert(bus); + assert(name); + assert(ret); + log_info("Running as unit %s.", name); r = sd_bus_message_new_method_call( @@ -199,7 +208,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, false, ".slice"); if (!slice) return -ENOMEM; @@ -221,11 +230,18 @@ 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; + assert(bus); + assert(m); + r = sd_bus_message_close_container(m); if (r < 0) return r; - return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); + r = sd_bus_message_append(m, "a(sa(sv))", 0); + if (r < 0) + return r; + + return sd_bus_call(bus, m, 0, error, reply); } static int start_transient_service( @@ -233,13 +249,13 @@ static int start_transient_service( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_free_ char *name = NULL; char **i; int r; if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".service"); + name = unit_name_mangle_with_suffix(arg_unit, false, ".service"); else asprintf(&name, "run-%lu.service", (unsigned long) getpid()); if (!name) @@ -311,7 +327,7 @@ static int start_transient_service( if (r < 0) return r; - return message_start_transient_unit_send(bus, m, error, &reply); + return message_start_transient_unit_send(bus, m, error, NULL); } static int start_transient_scope( @@ -319,12 +335,14 @@ static int start_transient_scope( char **argv, sd_bus_error *error) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_free_ char *name = NULL; int r; + assert(bus); + if (arg_unit) - name = unit_name_mangle_with_suffix(arg_unit, ".scope"); + name = unit_name_mangle_with_suffix(arg_unit, false, ".scope"); else asprintf(&name, "run-%lu.scope", (unsigned long) getpid()); if (!name) @@ -338,7 +356,7 @@ static int start_transient_scope( if (r < 0) return r; - r = message_start_transient_unit_send(bus, m, error, &reply); + r = message_start_transient_unit_send(bus, m, error, NULL); if (r < 0) return r; @@ -348,7 +366,7 @@ static int start_transient_scope( } int main(int argc, char* argv[]) { - sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; _cleanup_free_ char *description = NULL, *command = NULL; int r; @@ -358,12 +376,12 @@ int main(int argc, char* argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto fail; + goto finish; r = find_binary(argv[optind], &command); if (r < 0) { log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); - goto fail; + goto finish; } argv[optind] = command; @@ -371,7 +389,7 @@ int main(int argc, char* argv[]) { description = strv_join(argv + optind, " "); if (!description) { r = log_oom(); - goto fail; + goto finish; } arg_description = description; @@ -380,19 +398,16 @@ int main(int argc, char* argv[]) { r = bus_open_transport(arg_transport, arg_host, arg_user, &bus); if (r < 0) { log_error("Failed to create bus connection: %s", strerror(-r)); - goto fail; + goto finish; } if (arg_scope) r = start_transient_scope(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; - } + if (r < 0) + log_error("Failed start transient unit: %s", bus_error_message(&error, r)); -fail: +finish: return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }