chiark / gitweb /
core: skip the removal of cgroups in the TEST_RUN_MINIMAL mode (#8622)
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 3 Apr 2018 13:04:22 +0000 (16:04 +0300)
committerSven Eden <yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000 (16:47 +0200)
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.

src/core/cgroup.c

index 7b9e29b6ff4f445aa972de44984af07684885155..429d4ca382b1c5884c3de2d784f6a36677b96149 100644 (file)
@@ -2340,7 +2340,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
 #if 0 /// elogind is not init
         /* We can't really delete the group, since we are in it. But
          * 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);
 
         m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source);