X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fscope.c;h=41da3b9378dc2f083fa8d5bf119aadfd783ef826;hb=1f19a534ea84458670ec011f6d1ba96f76e3f783;hp=b94f3ff7ba2758c50d3946b9bd3c634bc39186ea;hpb=7b617155b50fdaad5d06359eb03e98f0c7b3087b;p=elogind.git

diff --git a/src/core/scope.c b/src/core/scope.c
index b94f3ff7b..41da3b937 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -46,7 +46,7 @@ static void scope_init(Unit *u) {
         assert(u);
         assert(u->load_state == UNIT_STUB);
 
-        s->timeout_stop_usec = DEFAULT_TIMEOUT_USEC;
+        s->timeout_stop_usec = u->manager->default_timeout_stop_usec;
 
         watch_init(&s->timer_watch);
 
@@ -257,7 +257,7 @@ static int scope_start(Unit *u) {
                 return r;
         }
 
-        r = cg_attach_many_with_mask(u->cgroup_mask, u->cgroup_path, s->pids);
+        r = cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, s->pids);
         if (r < 0)
                 return r;