shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

core: do not setup/teardown cgroup if MANAGER_TEST_RUN_MINIMAL is set as a flag

Browse Source 
Rather than checking if test_run_flags is set exclusively to MANAGER_TEST_RUN_MINIMAL,
check if it is set as a flag, so that it can be used together with other flags.
This commit is contained in:
Luca Boccassi 2021-07-01 00:04:58 +01:00
parent 24c006d83d
commit 5dd2f5ff07
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/cgroup.c
View File

@ -3303,7 +3303,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 && m->test_run_flags != MANAGER_TEST_RUN_MINIMAL) if (delete && m->cgroup_root && !FLAGS_SET(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);

2
src/core/manager.c
View File

@ -870,7 +870,7 @@ int manager_new(UnitFileScope scope, ManagerTestRunFlags test_run_flags, Manager
if (r < 0) if (r < 0)
return r; return r;
if (test_run_flags == MANAGER_TEST_RUN_MINIMAL) { if (FLAGS_SET(test_run_flags, MANAGER_TEST_RUN_MINIMAL)) {
m->cgroup_root = strdup(""); m->cgroup_root = strdup("");
if (!m->cgroup_root) if (!m->cgroup_root)
return -ENOMEM; return -ENOMEM;