SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix order and document user unit dirs

Browse Source 
Fixup for 718880ba0d 'add a transient user unit directory'.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-02 11:11:31 -04:00
parent 4d5dec2389
commit aa08982d62
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/path-lookup.c
+7 -7
View File
@@ -162,13 +162,6 @@ static char** user_dirs(
if (strv_extend(&r, config_home) < 0)
goto fail;
if (runtime_dir)
if (strv_extend(&r, runtime_dir) < 0)
goto fail;
if (strv_extend(&r, runtime_unit_path) < 0)
goto fail;
if (!strv_isempty(config_dirs))
if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0)
goto fail;
@@ -176,6 +169,13 @@ static char** user_dirs(
if (strv_extend_strv(&r, (char**) config_unit_paths) < 0)
goto fail;
if (runtime_dir)
if (strv_extend(&r, runtime_dir) < 0)
goto fail;
if (strv_extend(&r, runtime_unit_path) < 0)
goto fail;
if (generator)
if (strv_extend(&r, generator) < 0)
goto fail;