]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: ignore -.slice and init.scope when isolating 1516/head
authorLennart Poettering <lennart@poettering.net>
Fri, 9 Oct 2015 15:18:18 +0000 (17:18 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 9 Oct 2015 15:20:32 +0000 (17:20 +0200)
Otherwise, we might end up trying to isolate it away when starting user
instances.

While we are at it, also prohibit manual start/stop of these two units.

Fixes: #1507
src/core/scope.c
src/core/slice.c

index 7325e3601b03998d87a33ac5adcf45e6afcff168..ea7d846578bf10ce23ffb12c7a3743f0991e916f 100644 (file)
@@ -534,6 +534,9 @@ static int scope_enumerate(Manager *m) {
         u->transient = true;
         u->default_dependencies = false;
         u->no_gc = true;
+        u->ignore_on_isolate = true;
+        u->refuse_manual_start = true;
+        u->refuse_manual_stop = true;
         SCOPE(u)->deserialized_state = SCOPE_RUNNING;
         SCOPE(u)->kill_context.kill_signal = SIGRTMIN+14;
 
index 063024134ace021dabeea185b8e4bb53fa44b1ac..1542e83eb6b468e0fef2ecb797083aa06f04b6e5 100644 (file)
@@ -274,6 +274,9 @@ static int slice_enumerate(Manager *m) {
 
         u->default_dependencies = false;
         u->no_gc = true;
+        u->ignore_on_isolate = true;
+        u->refuse_manual_start = true;
+        u->refuse_manual_stop = true;
         SLICE(u)->deserialized_state = SLICE_ACTIVE;
 
         if (!u->description)