projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18ce247
)
Revert "core: don't setup init.scope in test mode (#8380)" (#8390)
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 8 Mar 2018 06:29:19 +0000
(15:29 +0900)
committer
GitHub
<noreply@github.com>
Thu, 8 Mar 2018 06:29:19 +0000
(15:29 +0900)
This reverts commit
a9e8ecf0374c675831208559ba37749a8f9719ef
,
as it breaks test-path.
Fixes #8389.
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index
cc9a17a
..
84adb9c
100644
(file)
--- 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)