picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: exclude .slice units from "systemctl isolate"

Browse source 
Fixes: #1969
This commit is contained in:
Lennart Poettering 2016-02-18 22:51:23 +01:00
parent 36c7d7097b
commit 1b4cd0cf11
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/scope.c
View file

@ -50,8 +50,7 @@ static void scope_init(Unit *u) {
assert(u->load_state == UNIT_STUB);
s->timeout_stop_usec = u->manager->default_timeout_stop_usec;
UNIT(s)->ignore_on_isolate = true;
u->ignore_on_isolate = true;
}
static void scope_done(Unit *u) {

8
src/core/slice.c
View file

@ -34,6 +34,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);
@ -305,6 +312,7 @@ const UnitVTable slice_vtable = {
.no_instances = true,
.can_transient = true,
.init = slice_init,
.load = slice_load,
.coldplug = slice_coldplug,