picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

Fixes #8389.
This commit is contained in:
Yu Watanabe 2018-03-08 15:29:19 +09:00 committed by GitHub
parent 18ce247c4c
commit a1d32bac2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/manager.c
View File

@ -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)