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

Fix order and document user unit dirs 

Fixup for 718880ba0d 'add a transient user unit directory'.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-10-02 08:11:21 -04:00
parent 4d5dec2389
commit aa08982d62
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.unit.xml
View File

@ -73,6 +73,7 @@
<para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
<filename>$HOME/.config/systemd/user/*</filename>
<filename>/etc/systemd/user/*</filename>
<filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
<filename>/run/systemd/user/*</filename>
<filename>$XDG_DATA_HOME/systemd/user/*</filename>
<filename>$HOME/.local/share/systemd/user/*</filename>
@ -343,6 +344,10 @@
<entry><filename>/etc/systemd/user</filename></entry>
<entry>Local configuration</entry>
</row>
<row>
<entry><filename>$XDG_RUNTIME_DIR/systemd/user</filename></entry>
<entry>Runtime units (only used when $XDG_RUNTIME_DIR is set)</entry>
</row>
<row>
<entry><filename>/run/systemd/user</filename></entry>
<entry>Runtime units</entry>

14
src/shared/path-lookup.c
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;