diff --git a/src/core/scope.c b/src/core/scope.c index 468dd81217..2831e057a1 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 fef47b04fe..ef2177279a 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"); @@ -147,6 +146,29 @@ static int slice_load_root_slice(Unit *u) { return 1; } +static int slice_load_system_slice(Unit *u) { + assert(u); + + if (!MANAGER_IS_SYSTEM(u->manager)) + return 0; + if (!unit_has_name(u, SPECIAL_SYSTEM_SLICE)) + return 0; + + u->perpetual = true; + + /* The system slice is a bit special. For example it is always running and cannot be terminated. Because of its + * special semantics we synthesize it here, instead of relying on the unit file on disk. */ + + u->default_dependencies = false; + + if (!u->description) + u->description = strdup("System Slice"); + if (!u->documentation) + u->documentation = strv_new("man:systemd.special(7)", NULL); + + return 1; +} + static int slice_load(Unit *u) { Slice *s = SLICE(u); int r; @@ -157,6 +179,10 @@ static int slice_load(Unit *u) { r = slice_load_root_slice(u); if (r < 0) return r; + r = slice_load_system_slice(u); + if (r < 0) + return r; + r = unit_load_fragment_and_dropin_optional(u); if (r < 0) return r; @@ -287,17 +313,17 @@ _pure_ static const char *slice_sub_state_to_string(Unit *u) { return slice_state_to_string(SLICE(u)->state); } -static void slice_enumerate(Manager *m) { +static void slice_enumerate_perpetual(Manager *m, const char *name) { Unit *u; int r; assert(m); - u = manager_get_unit(m, SPECIAL_ROOT_SLICE); + u = manager_get_unit(m, name); if (!u) { - r = unit_new_for_name(m, sizeof(Slice), SPECIAL_ROOT_SLICE, &u); + r = unit_new_for_name(m, sizeof(Slice), name, &u); if (r < 0) { - log_error_errno(r, "Failed to allocate the special " SPECIAL_ROOT_SLICE " unit: %m"); + log_error_errno(r, "Failed to allocate the special %s unit: %m", name); return; } } @@ -309,6 +335,15 @@ static void slice_enumerate(Manager *m) { unit_add_to_dbus_queue(u); } +static void slice_enumerate(Manager *m) { + assert(m); + + slice_enumerate_perpetual(m, SPECIAL_ROOT_SLICE); + + if (MANAGER_IS_SYSTEM(m)) + slice_enumerate_perpetual(m, SPECIAL_SYSTEM_SLICE); +} + const UnitVTable slice_vtable = { .object_size = sizeof(Slice), .cgroup_context_offset = offsetof(Slice, cgroup_context), diff --git a/units/meson.build b/units/meson.build index 814ee7885b..7f40464190 100644 --- a/units/meson.build +++ b/units/meson.build @@ -91,7 +91,6 @@ units = [ ['sysinit.target', ''], ['syslog.socket', ''], ['system-update.target', ''], - ['system.slice', ''], ['systemd-ask-password-console.path', '', 'sysinit.target.wants/'], ['systemd-ask-password-wall.path', '', diff --git a/units/system.slice b/units/system.slice deleted file mode 100644 index a4d5edfae8..0000000000 --- a/units/system.slice +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=System Slice -Documentation=man:systemd.special(7) -DefaultDependencies=no -Before=slices.target