From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 8 Mar 2018 06:29:19 +0000 (+0900)
Subject: Revert "core: don't setup init.scope in test mode (#8380)" (#8390)
X-Git-Tag: v239~571
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1d32bac2a27a14cce254de282b94371bad57878;p=thirdparty%2Fsystemd.git

Revert "core: don't setup init.scope in test mode (#8380)" (#8390)

This reverts commit a9e8ecf0374c675831208559ba37749a8f9719ef,
as it breaks test-path.

Fixes #8389.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index cc9a17a2fd4..84adb9c6660 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -759,11 +759,9 @@ int manager_new(UnitFileScope scope, unsigned test_run_flags, Manager **_m) {
         if (r < 0)
                 goto fail;
 
-        if (test_run_flags == 0) {
-                r = manager_setup_cgroup(m);
-                if (r < 0)
-                        goto fail;
-        }
+        r = manager_setup_cgroup(m);
+        if (r < 0)
+                goto fail;
 
         r = manager_setup_time_change(m);
         if (r < 0)