From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Oct 2018 10:36:16 +0000 (+0200)
Subject: Merge pull request #10343 from poettering/manager-state-fix
X-Git-Tag: v240~585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f436470ae110404ec84dd8d01df9351c0f7ddb7a;p=thirdparty%2Fsystemd.git

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

various fixes for PID1's Manager object
---

f436470ae110404ec84dd8d01df9351c0f7ddb7a
diff --cc src/core/cgroup.c
index a34df2538fa,6a6766f6faf..9f5e67ba226
--- a/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");