summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-09 17:18:18 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-09 17:20:32 +0200
commit417800228f69db9ff37f4193d11508757dd09308 (patch)
tree6d03c9d5d3391283e37a6e44d2a34263678f7cbb
parentc463a6f1c4d375929a99ac258292ce5e1f64a835 (diff)
core: ignore -.slice and init.scope when isolating
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
-rw-r--r--src/core/scope.c3
-rw-r--r--src/core/slice.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/scope.c b/src/core/scope.c
index 7325e3601b..ea7d846578 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -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;
diff --git a/src/core/slice.c b/src/core/slice.c
index 063024134a..1542e83eb6 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -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)