system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Move user units into app.slice by default

Browse source 
This changes the default from putting all units into the root slice to
placing them into the app slice in the user manager. The advantage is
that we get the right behaviour in most cases, and we'll need special
case handling in all other cases anyway.

Note that we have currently defined that applications *should* start
their unit names with app-, so we could also move only these by creating
a drop-in for app-.scope and app-.service.
However, that would not answer the question on how we should manage
session.slice. And we would end up placing anything that does not fit
the system (e.g. anything started by dbus-broker currently) into the
root slice.
This commit is contained in:
Benjamin Berg 2020-07-28 19:12:56 +02:00
parent 0b432bdc2e
commit 7f3b86a497
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/unit.c
View file

@ -3345,12 +3345,16 @@ int unit_set_default_slice(Unit *u) {
if (MANAGER_IS_SYSTEM(u->manager))
slice_name = strjoina("system-", escaped, ".slice");
else
slice_name = strjoina(escaped, ".slice");
} else
slice_name =
MANAGER_IS_SYSTEM(u->manager) && !unit_has_name(u, SPECIAL_INIT_SCOPE)
? SPECIAL_SYSTEM_SLICE
: SPECIAL_ROOT_SLICE;
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;
}
r = manager_load_unit(u->manager, slice_name, NULL, NULL, &slice);
if (r < 0)