X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Frun%2Frun.c;h=e56a977de35447d04472c50e21e8678db84d00c7;hb=3803cde44c3d949765bdf0e8bce06886224d40b4;hp=b45116870c6dd10f7ed0785a2d60b7c09ba57a30;hpb=6c12b52e19640747e96f89d85422941a23dc6b29;p=elogind.git

diff --git a/src/run/run.c b/src/run/run.c
index b45116870..e56a977de 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -32,16 +32,20 @@
 static bool arg_scope = false;
 static bool arg_user = false;
 static const char *arg_unit = NULL;
+static const char *arg_description = NULL;
+static const char *arg_slice = NULL;
 
 static int help(void) {
 
         printf("%s [OPTIONS...] [COMMAND LINE...]\n\n"
-               "Notify the init system about service status updates.\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",
+               "     --unit=UNIT        Run under the specified unit name\n"
+               "     --description=TEXT Description for unit\n"
+               "     --slice=SLICE      Run in the specified slice\n",
                program_invocation_short_name);
 
         return 0;
@@ -53,16 +57,20 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_VERSION = 0x100,
                 ARG_USER,
                 ARG_SCOPE,
-                ARG_UNIT
+                ARG_UNIT,
+                ARG_DESCRIPTION,
+                ARG_SLICE
         };
 
         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       },
+                { NULL,          0,                 NULL, 0               },
         };
 
         int c;
@@ -95,6 +103,14 @@ 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 '?':
                         return -EINVAL;
 
@@ -135,10 +151,22 @@ 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;
+        }
+
         *ret = m;
         m = NULL;
 
@@ -148,10 +176,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 +204,10 @@ static int start_transient_service(
         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 +258,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 +285,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 +301,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;
         int r;
 
         log_parse_environment();
@@ -278,6 +311,16 @@ int main(int argc, char* argv[]) {
         if (r <= 0)
                 goto fail;
 
+        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 +335,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;
         }