Merge pull request #10343 from poettering/manager-state-fix

various fixes for PID1's Manager object

diff --cc src/core/cgroup.c
index a34df2538fae18855a168c2caa06a91ecd269f2b,6a6766f6faf41471ceb711de23d574ae2821280a..9f5e67ba22658cfe8229500129c0b08d2bbf0d6b
--- 1/src/core/cgroup.c
--- 2/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@@ -2395,10 -2338,10 +2395,10 @@@ int manager_setup_cgroup(Manager *m) 
                  return log_error_errno(r, "Failed to create %s control group: %m", scope_path);
  
          /* 7. Always enable hierarchical support if it exists... */
-         if (!all_unified && m->test_run_flags == 0)
+         if (!all_unified && !MANAGER_IS_TEST_RUN(m))
                  (void) cg_set_attribute("memory", "/", "memory.use_hierarchy", "1");
  
 -        /* 8. Figure out which controllers are supported, and log about it */
 +        /* 8. Figure out which controllers are supported */
          r = cg_mask_supported(&m->cgroup_supported);
          if (r < 0)
                  return log_error_errno(r, "Failed to determine supported controllers: %m");

diff --cc src/core/main.c
Simple merge

diff --cc src/core/unit.c
Simple merge