]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #20080 from bluca/core_flag
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 1 Jul 2021 07:04:15 +0000 (09:04 +0200)
committerGitHub <noreply@github.com>
Thu, 1 Jul 2021 07:04:15 +0000 (09:04 +0200)
analyze: do not attempt to set up cgroups while verifying units

1  2 
src/core/cgroup.c
src/core/manager.c

index b44391ac22fe46c813ccdd2a6015c999274f37b8,8f39c9436bf1e25ab1598af11168166048d5d5da..2cbb78997869e2291d47b67031fba488ea4c7364
@@@ -3303,10 -3303,10 +3303,10 @@@ void manager_shutdown_cgroup(Manager *m
  
          /* We can't really delete the group, since we are in it. But
           * 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);
  
 -        m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source);
 +        m->cgroup_empty_event_source = sd_event_source_disable_unref(m->cgroup_empty_event_source);
  
          m->cgroup_control_inotify_wd_unit = hashmap_free(m->cgroup_control_inotify_wd_unit);
          m->cgroup_memory_inotify_wd_unit = hashmap_free(m->cgroup_memory_inotify_wd_unit);
Simple merge