chiark / gitweb /
remove unused variable
[elogind.git] / src / run / run.c
index 9f8bda4..2e0cd1a 100644 (file)
 ***/
 
 #include <stdio.h>
+#include <getopt.h>
 
 #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 "path-util.h"
+#include "bus-error.h"
+
+static bool arg_scope = 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 BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
+static char *arg_host = NULL;
+static bool arg_user = false;
+
+static int help(void) {
+
+        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"
+               "  -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"
+               "     --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;
+}
 
-static int start_transient_service(
-                sd_bus *bus,
-                const char *name,
-                char **argv,
-                sd_bus_error *error) {
+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_SEND_SIGHUP,
+        };
+
+        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, 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'             },
+                {},
+        };
+
+        int c;
+
+        assert(argc >= 0);
+        assert(argv);
+
+        while ((c = getopt_long(argc, argv, "+hrH:M:", options, NULL)) >= 0) {
+
+                switch (c) {
+
+                case 'h':
+                        return help();
+
+                case ARG_VERSION:
+                        puts(PACKAGE_STRING);
+                        puts(SYSTEMD_FEATURES);
+                        return 0;
+
+                case ARG_USER:
+                        arg_user = true;
+                        break;
+
+                case ARG_SYSTEM:
+                        arg_user = false;
+                        break;
+
+                case ARG_SCOPE:
+                        arg_scope = true;
+                        break;
+
+                case ARG_UNIT:
+                        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 'H':
+                        arg_transport = BUS_TRANSPORT_REMOTE;
+                        arg_host = optarg;
+                        break;
+
+                case 'M':
+                        arg_transport = BUS_TRANSPORT_CONTAINER;
+                        arg_host = optarg;
+                        break;
+
+                case '?':
+                        return -EINVAL;
+
+                default:
+                        assert_not_reached("Unhandled option");
+                }
+        }
 
-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
-        char **i;
+        if (optind >= argc) {
+                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;
+        }
+
+        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;
         int r;
 
+        assert(bus);
+        assert(name);
+        assert(ret);
+
+        log_info("Running as unit %s.", name);
+
         r = sd_bus_message_new_method_call(
                         bus,
                         "org.freedesktop.systemd1",
@@ -53,6 +201,74 @@ static int start_transient_service(
         if (r < 0)
                 return r;
 
+        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;
+
+        *ret = m;
+        m = NULL;
+
+        return 0;
+}
+
+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;
+
+        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(
+                sd_bus *bus,
+                char **argv,
+                sd_bus_error *error) {
+
+        _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");
+        else
+                asprintf(&name, "run-%lu.service", (unsigned long) getpid());
+        if (!name)
+                return -ENOMEM;
+
+        r = message_start_transient_unit_new(bus, name, &m);
+        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;
@@ -111,46 +327,87 @@ static int start_transient_service(
         if (r < 0)
                 return r;
 
-        r = sd_bus_message_close_container(m);
+        return message_start_transient_unit_send(bus, m, error, NULL);
+}
+
+static int start_transient_scope(
+                sd_bus *bus,
+                char **argv,
+                sd_bus_error *error) {
+
+        _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");
+        else
+                asprintf(&name, "run-%lu.scope", (unsigned long) getpid());
+        if (!name)
+                return -ENOMEM;
+
+        r = message_start_transient_unit_new(bus, name, &m);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
+        if (r < 0)
+                return r;
+
+        r = message_start_transient_unit_send(bus, m, error, NULL);
         if (r < 0)
                 return r;
 
-        return sd_bus_send_with_reply_and_block(bus, m, 0, error, &reply);
+        execvp(argv[0], argv);
+        log_error("Failed to execute: %m");
+        return -errno;
 }
 
 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 *name = NULL;
+        _cleanup_free_ char *description = NULL, *command = NULL;
         int r;
 
         log_parse_environment();
         log_open();
 
-        if (argc < 2) {
-                log_error("Missing command line.");
-                r = -EINVAL;
-                goto fail;
-        }
+        r = parse_argv(argc, argv);
+        if (r <= 0)
+                goto finish;
 
-        r = sd_bus_open_user(&bus);
+        r = find_binary(argv[optind], &command);
         if (r < 0) {
-                log_error("Failed to create new bus: %s", strerror(-r));
-                goto fail;
+                log_error("Failed to find executable %s: %s", argv[optind], strerror(-r));
+                goto finish;
         }
+        argv[optind] = command;
+
+        if (!arg_description) {
+                description = strv_join(argv + optind, " ");
+                if (!description) {
+                        r = log_oom();
+                        goto finish;
+                }
 
-        if (asprintf(&name, "run-%lu.service", (unsigned long) getpid()) < 0) {
-                r = log_oom();
-                goto fail;
+                arg_description = description;
         }
 
-        r = start_transient_service(bus, name, argv + 1, &error);
+        r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
         if (r < 0) {
-                log_error("Failed start transient service: %s", error.message);
-                sd_bus_error_free(&error);
-                goto fail;
+                log_error("Failed to create bus connection: %s", strerror(-r));
+                goto finish;
         }
 
-fail:
+        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", bus_error_message(&error, r));
+
+finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }