shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

user: move "extrinsic" units to their root slice

Browse Source 
With the grandparent change to move most units to app.slice,
those units would be ordered After=app.slice which doesn't make any sense.
Actually they appear earlier, before the manager is even started, and
conceputally it doesn't seem useful to put them under any slice.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-11-05 13:59:17 +01:00
parent 39c79477ac
commit 5ee24fa0a0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/unit.c
View File

@ -3350,15 +3350,16 @@ int unit_set_default_slice(Unit *u) {
slice_name = strjoina("system-", escaped, ".slice");
else
slice_name = strjoina("app-", escaped, ".slice");
} else {
if (MANAGER_IS_SYSTEM(u->manager))
slice_name =
unit_has_name(u, SPECIAL_INIT_SCOPE)
? SPECIAL_ROOT_SLICE
: SPECIAL_SYSTEM_SLICE;
else
slice_name = SPECIAL_APP_SLICE;
}
} else if (unit_is_extrinsic(u))
/* Keep all extrinsic units (e.g. perpetual units and swap and mount units in user mode) in
* the root slice. They don't really belong in one of the subslices. */
slice_name = SPECIAL_ROOT_SLICE;
else if (MANAGER_IS_SYSTEM(u->manager))
slice_name = SPECIAL_SYSTEM_SLICE;
else
slice_name = SPECIAL_APP_SLICE;
r = manager_load_unit(u->manager, slice_name, NULL, NULL, &slice);
if (r < 0)