From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Sun, 4 Feb 2018 20:16:50 +0000 (+0000)
Subject: slice, scope: IgnoreOnIsolate=yes is already the default
X-Git-Tag: v238~138^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c79456781ab649ef28c0343e4f42f0861d083ad;p=platform%2Fupstream%2Fsystemd.git

slice, scope: IgnoreOnIsolate=yes is already the default

`IgnoreOnIsolate=yes` is the default for slices and scopes.  So it's not
essential to set it on root.slice or init.scope.

We don't need to worry about a bad unit file configuration.  Any attempt
to stop these unit should fail, since we mark them as `perpetual`.

Also since init.scope cannot be stopped, there is no point setting
`KillSignal=SIGRTMIN+14`.  According to both documentation and testing,
KillSignal= does not affect the behaviour of `systemctl kill`.
---

diff --git a/src/core/scope.c b/src/core/scope.c
index 10454d5..c49708a 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -163,9 +163,6 @@ static int scope_load_init_scope(Unit *u) {
          * synthesize it here, instead of relying on the unit file on disk. */
 
         u->default_dependencies = false;
-        u->ignore_on_isolate = true;
-
-        SCOPE(u)->kill_context.kill_signal = SIGRTMIN+14;
 
         /* Prettify things, if we can. */
         if (!u->description)
diff --git a/src/core/slice.c b/src/core/slice.c
index fef47b0..0bbc0ae 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -137,7 +137,6 @@ static int slice_load_root_slice(Unit *u) {
          * special semantics we synthesize it here, instead of relying on the unit file on disk. */
 
         u->default_dependencies = false;
-        u->ignore_on_isolate = true;
 
         if (!u->description)
                 u->description = strdup("Root Slice");