X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-service.c;h=696c4462fe257010dcd394afd4bea39e7060bdb6;hb=a6fde35332f5e7f78bff437d7b7bfded83debbaa;hp=d63ca01c4fdacce387112880bc8a8480d857b420;hpb=665f8316f435772ed539be5e164a85cd188f84b4;p=elogind.git

diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index d63ca01c4..696c4462f 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -180,7 +180,22 @@ static int bus_service_set_transient_property(
         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;
 
@@ -258,25 +273,20 @@ static int bus_service_set_transient_property(
                         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, name, buf);
+                        unit_write_drop_in_private(UNIT(s), mode, name, buf);
                 }
 
                 return 1;
@@ -309,6 +319,10 @@ int bus_service_set_property(
                 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;
         }
 
         return 0;