Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#1745199) core: exclude .slice units from "systemctl isolate" #38

Merged
merged 1 commit into from Sep 2, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
core: exclude .slice units from "systemctl isolate"
Fixes: #1969
(cherry picked from commit 1b4cd0c)

Resolves: #1745199
  • Loading branch information
poettering authored and dtardon committed Aug 27, 2019
commit 3a3c7374893751d2974cbb1b05dfbf71b49df590
8 changes: 8 additions & 0 deletions src/core/slice.c
Expand Up @@ -36,6 +36,13 @@ static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
[SLICE_ACTIVE] = UNIT_ACTIVE
};

static void slice_init(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);

u->ignore_on_isolate = true;
}

static void slice_set_state(Slice *t, SliceState state) {
SliceState old_state;
assert(t);
Expand Down Expand Up @@ -274,6 +281,7 @@ const UnitVTable slice_vtable = {
.no_instances = true,
.can_transient = true,

.init = slice_init,
.load = slice_load,

.coldplug = slice_coldplug,
Expand Down