chiark / gitweb /
remove unused variable
[elogind.git] / src / run / run.c
index c5d314b..2e0cd1a 100644 (file)
 #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_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 BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
+static char *arg_host = NULL;
+static bool arg_user = false;
 
 static int help(void) {
 
-        printf("%s [OPTIONS...] [COMMAND LINE...]\n\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"
+               "  -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"
@@ -60,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,
@@ -71,13 +77,16 @@ 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 },
                 { "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               },
+                { "host",              required_argument, NULL, 'H'             },
+                { "machine",           required_argument, NULL, 'M'             },
+                {},
         };
 
         int c;
@@ -85,13 +94,12 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "+hr", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "+hrH:M:", options, NULL)) >= 0) {
 
                 switch (c) {
 
                 case 'h':
-                        help();
-                        return 0;
+                        return help();
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
@@ -102,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;
@@ -126,12 +138,21 @@ static int parse_argv(int argc, char *argv[]) {
                         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:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");
                 }
         }
 
@@ -140,6 +161,16 @@ static int parse_argv(int argc, char *argv[]) {
                 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;
 }
 
@@ -147,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(
@@ -195,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(
@@ -207,7 +249,7 @@ 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;
@@ -285,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(
@@ -293,10 +335,12 @@ 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");
         else
@@ -312,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;
 
@@ -322,9 +366,9 @@ 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;
+        _cleanup_free_ char *description = NULL, *command = NULL;
         int r;
 
         log_parse_environment();
@@ -332,37 +376,38 @@ 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 finish;
+        }
+        argv[optind] = command;
 
         if (!arg_description) {
                 description = strv_join(argv + optind, " ");
                 if (!description) {
                         r = log_oom();
-                        goto fail;
+                        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(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("Failed to create bus connection: %s", strerror(-r));
+                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;
 }