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

core: skip the removal of cgroups in the TEST_RUN_MINIMAL mode (#8622)

Browse source 
When `systemd` is run in the TEST_RUN_MINIMAL mode, it doesn't really
set up cgroups, so it shouldn't try to remove anything.

Closes https://github.com/systemd/systemd/issues/8474.
This commit is contained in:
Evgeny Vereshchagin 2018-04-03 16:04:22 +03:00 committed by Lennart Poettering
parent cde942f61b
commit f6c63f6fc9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/cgroup.c
View file

@ -2305,7 +2305,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
/* We can't really delete the group, since we are in it. But /* We can't really delete the group, since we are in it. But
* let's trim it. */ * let's trim it. */
if (delete && m->cgroup_root) if (delete && m->cgroup_root && m->test_run_flags != MANAGER_TEST_RUN_MINIMAL)
(void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false); (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false);
m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source); m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source);