X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-service.c;h=c888570c4b9f9653c14d169d58e24ebc714425ae;hb=5b1869eaa22e365ab6595924fe96549b279b5ebc;hp=e5e95a1ab9c8644695e7efeee659ee8876c4275a;hpb=6a95dff87daf899a96135c7ab87aa1b1a67f6afc;p=elogind.git

diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index e5e95a1ab..c888570c4 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -46,6 +46,7 @@
         "  <property name=\"StartLimitInterval\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"StartLimitBurst\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"StartLimitAction\" type=\"s\" access=\"readwrite\"/>\n" \
+        BUS_UNIT_CGROUP_INTERFACE                                       \
         BUS_EXEC_COMMAND_INTERFACE("ExecStartPre")                      \
         BUS_EXEC_COMMAND_INTERFACE("ExecStart")                         \
         BUS_EXEC_COMMAND_INTERFACE("ExecStartPost")                     \
@@ -80,7 +81,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Service\0"
 
-const char bus_service_interface[] _introspect_("Service") = BUS_SERVICE_INTERFACE;
+const char bus_service_interface[] = BUS_SERVICE_INTERFACE;
 
 const char bus_service_invalidating_properties[] =
         "ExecStartPre\0"
@@ -152,6 +153,7 @@ DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connectio
 
         const BusBoundProperties bps[] = {
                 { "org.freedesktop.systemd1.Unit",    bus_unit_properties,             u },
+                { "org.freedesktop.systemd1.Service", bus_unit_cgroup_properties,      u },
                 { "org.freedesktop.systemd1.Service", bus_service_properties,          s },
                 { "org.freedesktop.systemd1.Service", bus_exec_context_properties,     &s->exec_context },
                 { "org.freedesktop.systemd1.Service", bus_kill_context_properties,     &s->kill_context },
@@ -165,7 +167,7 @@ DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connectio
         return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
 }
 
-static int bus_service_set_transient_properties(
+static int bus_service_set_transient_property(
                 Service *s,
                 const char *name,
                 DBusMessageIter *i,
@@ -178,7 +180,22 @@ static int bus_service_set_transient_properties(
         assert(s);
         assert(i);
 
-        if (streq(name, "ExecStart")) {
+        if (streq(name, "RemainAfterExit")) {
+                if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
+                        return -EINVAL;
+
+                if (mode != UNIT_CHECK) {
+                        dbus_bool_t b;
+
+                        dbus_message_iter_get_basic(i, &b);
+
+                        s->remain_after_exit = b;
+                        unit_write_drop_in_private_format(UNIT(s), mode, name, "RemainAfterExit=%s\n", yes_no(b));
+                }
+
+                return 1;
+
+        } else if (streq(name, "ExecStart")) {
                 DBusMessageIter sub;
                 unsigned n = 0;
 
@@ -256,25 +273,20 @@ static int bus_service_set_transient_properties(
                         fputs("ExecStart=\n", f);
 
                         LIST_FOREACH(command, c, s->exec_command[SERVICE_EXEC_START]) {
-                                char **a;
-                                fputs("ExecStart=", f);
-
-                                if (c->ignore)
-                                        fputc('-', f);
+                                _cleanup_free_ char *a;
 
-                                fputc('@', f);
-                                fputs(c->path, f);
-
-                                STRV_FOREACH(a, c->argv) {
-                                        fputc(' ', f);
-                                        fputs(*a, f);
-                                }
+                                a = strv_join_quoted(c->argv);
+                                if (!a)
+                                        return -ENOMEM;
 
-                                fputc('\n', f);
+                                fprintf(f, "ExecStart=%s@%s %s\n",
+                                        c->ignore ? "-" : "",
+                                        c->path,
+                                        a);
                         }
 
                         fflush(f);
-                        unit_write_drop_in_private_section(UNIT(s), mode, "exec-start", buf);
+                        unit_write_drop_in_private(UNIT(s), mode, name, buf);
                 }
 
                 return 1;
@@ -304,7 +316,11 @@ int bus_service_set_property(
         if (u->transient && u->load_state == UNIT_STUB) {
                 /* This is a transient unit, let's load a little more */
 
-                r = bus_service_set_transient_properties(s, name, i, mode, error);
+                r = bus_service_set_transient_property(s, name, i, mode, error);
+                if (r != 0)
+                        return r;
+
+                r = bus_kill_context_set_transient_property(u, &s->kill_context, name, i, mode, error);
                 if (r != 0)
                         return r;
         }