diff options
| author | Pass Automated Testing Suite <Pass-Automated-Testing-Suite@zx2c4.com> | 2020-09-28 17:49:55 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-09-29 21:47:01 +0200 |
| commit | e3820eeaf11f3b4614cbdfbc85675bc16a486e21 (patch) | |
| tree | 3f55c4a23296fc672b8be02ce210b669a7e45042 /man/systemd.unit.xml | |
| parent | f856778b9c87d2dc9a6924db0cf26374aa7235c3 (diff) | |
| download | systemd-e3820eeaf11f3b4614cbdfbc85675bc16a486e21.tar.gz | |
path-lookup: Correct order of XDG_CONFIG_HOME and XDG_CONFIG_DIRS
According to the XDG Base Directory Specification [1] XDG_CONFIG_HOME
should take precedence over XDG_CONFIG_DIRS.
Fixes: https://github.com/systemd/systemd/issues/16095
[1]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
Diffstat (limited to 'man/systemd.unit.xml')
| -rw-r--r-- | man/systemd.unit.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 23c60d5c01..cc6606022b 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -60,12 +60,14 @@ <filename>$XDG_RUNTIME_DIR/systemd/user.control/*</filename> <filename>$XDG_RUNTIME_DIR/systemd/transient/*</filename> <filename>$XDG_RUNTIME_DIR/systemd/generator.early/*</filename> -<filename>~/.config/systemd/user/*</filename> +<filename>$XDG_CONFIG_HOME/systemd/user/*</filename> +<filename>$XDG_CONFIG_DIRS/systemd/user/*</filename> <filename>/etc/systemd/user/*</filename> <filename>$XDG_RUNTIME_DIR/systemd/user/*</filename> <filename>/run/systemd/user/*</filename> <filename>$XDG_RUNTIME_DIR/systemd/generator/*</filename> -<filename>~/.local/share/systemd/user/*</filename> +<filename>$XDG_DATA_HOME/systemd/user/*</filename> +<filename>$XDG_DATA_DIRS/systemd/user/*</filename> <filename index='false'>…</filename> <filename>/usr/lib/systemd/user/*</filename> <filename>$XDG_RUNTIME_DIR/systemd/generator.late/*</filename></literallayout></para> @@ -435,6 +437,10 @@ <entry>User configuration (<varname>$XDG_CONFIG_HOME</varname> is used if set, <filename>~/.config</filename> otherwise)</entry> </row> <row> + <entry><filename>$XDG_CONFIG_DIRS/systemd/user</filename> or <filename>/etc/xdg/systemd/user</filename></entry> + <entry>Additional configuration directories as specified by the XDG base directory specification (<varname>$XDG_CONFIG_DIRS</varname> is used if set, <filename>/etc/xdg</filename> otherwise)</entry> + </row> + <row> <entry><filename>/etc/systemd/user</filename></entry> <entry>User units created by the administrator</entry> </row> @@ -456,6 +462,10 @@ <entry>Units of packages that have been installed in the home directory (<varname>$XDG_DATA_HOME</varname> is used if set, <filename>~/.local/share</filename> otherwise)</entry> </row> <row> + <entry><filename>$XDG_DATA_DIRS/systemd/user</filename> or <filename>/usr/local/share/systemd/user</filename> and <filename>/usr/share/systemd/user</filename></entry> + <entry>Additional data directories as specified by the XDG base directory specification (<varname>$XDG_DATA_DIRS</varname> is used if set, <filename>/usr/local/share</filename> and <filename>/usr/share</filename> otherwise)</entry> + </row> + <row> <entry><filename>$dir/systemd/user</filename> for each <varname index="false">$dir</varname> in <varname>$XDG_DATA_DIRS</varname></entry> <entry>Additional locations for installed user units, one for each entry in <varname>$XDG_DATA_DIRS</varname></entry> </row> |