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

manager: don't bother with creating /run/systemd/units/ in test mode

Browse source 
This makes sure running "systemd --test" works again on systems running
older systemd versions where the dir doesn't exist yet.
This commit is contained in:
Lennart Poettering 2017-12-06 23:24:29 +01:00
parent 279d81dd46
commit 5eb397cfad
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/manager.c
View file

@ -732,7 +732,7 @@ int manager_new(UnitFileScope scope, unsigned test_run_flags, Manager **_m) {
goto fail;
}
if (MANAGER_IS_SYSTEM(m)) {
if (MANAGER_IS_SYSTEM(m) && test_run_flags == 0) {
r = mkdir_label("/run/systemd/units", 0755);
if (r < 0 && r != -EEXIST)
goto fail;
@ -740,7 +740,6 @@ int manager_new(UnitFileScope scope, unsigned test_run_flags, Manager **_m) {
/* Note that we do not set up the notify fd here. We do that after deserialization,
* since they might have gotten serialized across the reexec. */
m->taint_usr = dir_is_empty("/usr") > 0;
r = manager_setup_prefix(m);