X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-scope.c;h=fbb4ff5646cdc31174836d140d1f1f29cea8f57e;hb=4e595329a93ed190795c2e24bf132d5028ec6a72;hp=d02569608cf042650aec6c85104f156143eb6488;hpb=4e2f8d27781731021aa6b96c0ee18a8966eefe1c;p=elogind.git

diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index d02569608..fbb4ff564 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -138,7 +138,7 @@ static int bus_scope_set_transient_property(
                         if (r < 0)
                                 return r;
 
-                        unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec=%lluus\n", (unsigned long long) s->timeout_stop_usec);
+                        unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec="USEC_FMT"us\n", s->timeout_stop_usec);
                 } else {
                         r = sd_bus_message_skip(message, "t");
                         if (r < 0)
@@ -187,7 +187,9 @@ int bus_scope_set_property(
 int bus_scope_commit_properties(Unit *u) {
         assert(u);
 
+        unit_update_cgroup_members_masks(u);
         unit_realize_cgroup(u);
+
         return 0;
 }
 
@@ -207,10 +209,10 @@ int bus_scope_send_request_stop(Scope *s) {
 
         r = sd_bus_message_new_signal(
                         UNIT(s)->manager->api_bus,
+                        &m,
                         p,
                         "org.freedesktop.systemd1.Scope",
-                        "RequestStop",
-                        &m);
+                        "RequestStop");
         if (r < 0)
                 return r;