From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 1 Jul 2021 07:04:15 +0000 (+0200)
Subject: Merge pull request #20080 from bluca/core_flag
X-Git-Tag: v249-rc3~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd376574fd62c6fcf446ee500ca85558a71d645e;p=thirdparty%2Fsystemd.git

Merge pull request #20080 from bluca/core_flag

analyze: do not attempt to set up cgroups while verifying units
---

dd376574fd62c6fcf446ee500ca85558a71d645e
diff --cc src/core/cgroup.c
index b44391ac22f,8f39c9436bf..2cbb7899786
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@@ -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);