chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: we need to be more careful with the unit search paths we document
[elogind.git]
/
man
/
systemd.unit.xml
diff --git
a/man/systemd.unit.xml
b/man/systemd.unit.xml
index 2196e73bb308f5649add04ec20d319b81811cbe0..68f02fcb6cdf56a5a8d06374d5cfadf0268bfd58 100644
(file)
--- a/
man/systemd.unit.xml
+++ b/
man/systemd.unit.xml
@@
-1,6
+1,9
@@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
This file is part of systemd.
<!--
This file is part of systemd.
@@
-242,7
+245,7
@@
</refsect1>
<refsect1>
</refsect1>
<refsect1>
- <title>Unit
load p
ath</title>
+ <title>Unit
Load P
ath</title>
<para>Unit files are loaded from a set of paths
determined during compilation, described in the two
<para>Unit files are loaded from a set of paths
determined during compilation, described in the two
@@
-251,7
+254,7
@@
lower in the hierarchy, thus allowing overrides.
</para>
lower in the hierarchy, thus allowing overrides.
</para>
- <para>When systemd is running in
session
mode
+ <para>When systemd is running in
user
mode
(<option>--user</option>) and the variable
<varname>$SYSTEMD_UNIT_PATH</varname> is set, this
contents of this variable overrides the unit load
(<option>--user</option>) and the variable
<varname>$SYSTEMD_UNIT_PATH</varname> is set, this
contents of this variable overrides the unit load
@@
-275,14
+278,11
@@
<tbody>
<row>
<entry><filename>/run/systemd/generator.early</filename></entry>
<tbody>
<row>
<entry><filename>/run/systemd/generator.early</filename></entry>
- <entry>Generated units</entry>
- </row>
- <row>
- <entry><filename>@SYSTEM_CONFIG_UNIT_PATH@</filename></entry>
- <entry morerows='1'>Local configuration</entry>
+ <entry>Generated units (early)</entry>
</row>
<row>
<entry><filename>/etc/systemd/system</filename></entry>
</row>
<row>
<entry><filename>/etc/systemd/system</filename></entry>
+ <entry>Local configuration</entry>
</row>
<row>
<entry><filename>/run/systemd/systemd</filename></entry>
</row>
<row>
<entry><filename>/run/systemd/systemd</filename></entry>
@@
-290,26
+290,19
@@
</row>
<row>
<entry><filename>/run/systemd/generator</filename></entry>
</row>
<row>
<entry><filename>/run/systemd/generator</filename></entry>
- <entry>Generated units</entry>
+ <entry>Generated units
(middle)
</entry>
</row>
<row>
<entry><filename>/usr/local/lib/systemd/system</filename></entry>
<entry>Units for local packages</entry>
</row>
</row>
<row>
<entry><filename>/usr/local/lib/systemd/system</filename></entry>
<entry>Units for local packages</entry>
</row>
- <row>
- <entry><filename>@systemunitdir@</filename></entry>
- <entry>Systemd package configuration</entry>
- </row>
<row>
<entry><filename>/usr/lib/systemd/system</filename></entry>
<row>
<entry><filename>/usr/lib/systemd/system</filename></entry>
- <entry morerows='1'>Units for installed packages</entry>
- </row>
- <row>
- <entry><filename>/lib/systemd/system</filename></entry>
+ <entry>Units for installed packages</entry>
</row>
<row>
<entry><filename>/run/systemd/generator.late</filename></entry>
</row>
<row>
<entry><filename>/run/systemd/generator.late</filename></entry>
- <entry>Generated units</entry>
+ <entry>Generated units
(late)
</entry>
</row>
</tbody>
</tgroup>
</row>
</tbody>
</tgroup>
@@
-332,14
+325,11
@@
<tbody>
<row>
<entry><filename>/tmp/systemd-generator.early.<replaceable>XXXXXX</replaceable></filename></entry>
<tbody>
<row>
<entry><filename>/tmp/systemd-generator.early.<replaceable>XXXXXX</replaceable></filename></entry>
- <entry>Generated units</entry>
- </row>
- <row>
- <entry><filename>@USER_CONFIG_UNIT_PATH@</filename></entry>
- <entry morerows='1'>Local configuration</entry>
+ <entry>Generated units (early)</entry>
</row>
<row>
<entry><filename>/etc/systemd/user</filename></entry>
</row>
<row>
<entry><filename>/etc/systemd/user</filename></entry>
+ <entry>Local configuration</entry>
</row>
<row>
<entry><filename>/run/systemd/user</filename></entry>
</row>
<row>
<entry><filename>/run/systemd/user</filename></entry>
@@
-347,40
+337,24
@@
</row>
<row>
<entry><filename>/tmp/systemd-generator.<replaceable>XXXXXX</replaceable></filename></entry>
</row>
<row>
<entry><filename>/tmp/systemd-generator.<replaceable>XXXXXX</replaceable></filename></entry>
- <entry>Generated units</entry>
+ <entry>Generated units
(middle)
</entry>
</row>
<row>
<entry><filename>/usr/local/lib/systemd/user</filename></entry>
</row>
<row>
<entry><filename>/usr/local/lib/systemd/user</filename></entry>
- <entry morerows='1'>Units for local packages</entry>
- </row>
- <row>
- <entry><filename>/usr/local/share/systemd/user</filename></entry>
- </row>
- <row>
- <entry><filename>@userunitdir@</filename></entry>
- <entry>Systemd package configuration</entry>
+ <entry>Units for local packages</entry>
</row>
<row>
<entry><filename>/usr/lib/systemd/user</filename></entry>
</row>
<row>
<entry><filename>/usr/lib/systemd/user</filename></entry>
- <entry morerows='1'>Units for installed packages</entry>
- </row>
- <row>
- <entry><filename>/usr/share/systemd/user</filename></entry>
+ <entry>Units for installed packages</entry>
</row>
<row>
<entry><filename>/tmp/systemd-generator.late.<replaceable>XXXXXX</replaceable></filename></entry>
</row>
<row>
<entry><filename>/tmp/systemd-generator.late.<replaceable>XXXXXX</replaceable></filename></entry>
- <entry>Generated units</entry>
+ <entry>Generated units
(late)
</entry>
</row>
</tbody>
</tgroup>
</table>
</row>
</tbody>
</tgroup>
</table>
- <para>Note: the paths listed above are set at
- compilation time and differ between distributions. The
- "authorative" list is printed by
- <command>systemd</command> at during start and daemon
- reconfiguration.</para>
-
<para>Additional units might be loaded into systemd
("linked") from directories not on the unit load
path. See the <command>link</command> command for
<para>Additional units might be loaded into systemd
("linked") from directories not on the unit load
path. See the <command>link</command> command for