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=e5a62d9e35a278f437100374b0400078599f2f32;hb=cac914e643a50c72893c5478f6886e0978f8fa18;hpb=c221420be8744bb0f8b8a8145efc1f247f1aa801

diff --git a/src/run/run.c b/src/run/run.c
index e5a62d9e3..18a4920f0 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -28,24 +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"
-               "     --description=TEXT Description for unit\n"
-               "     --slice=SLICE      Run in the specified slice\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;
@@ -59,18 +64,21 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_SCOPE,
                 ARG_UNIT,
                 ARG_DESCRIPTION,
-                ARG_SLICE
+                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        },
-                { "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        },
+                { "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;
@@ -78,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) {
 
@@ -111,6 +119,14 @@ 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 '?':
                         return -EINVAL;
 
@@ -167,6 +183,10 @@ static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu
                         return r;
         }
 
+        r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup);
+        if (r < 0)
+                return r;
+
         *ret = m;
         m = NULL;
 
@@ -204,6 +224,10 @@ 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;
@@ -301,7 +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;
+        _cleanup_free_ char *description = NULL, *command = NULL;
         int r;
 
         log_parse_environment();
@@ -311,6 +335,13 @@ 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) {