diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-29 20:36:49 -0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-30 08:36:02 -0300 |
| commit | 00d1818bb7fbc01086cc956fdb1fcbc8fb90482b (patch) | |
| tree | 11780b39057fb4cec43be3e00df442abc45ec90a /man/systemd.unit.xml | |
| parent | 8af8afd6b3a34d1218826f55ada8ece8b4e36fed (diff) | |
man: we need to be more careful with the unit search paths we document
We generally document the suggested paths, not the paths possible in
weird, non-standard setups. We do this in order to not confuse
administrators/users unnecessarily and to push people to install things
into the same directories on all distributions.
We are PID 1 after all, the really basic building block of the OS.
Unlike for an app there's very little benefit in being entirely
relocatable.
Diffstat (limited to 'man/systemd.unit.xml')
| -rw-r--r-- | man/systemd.unit.xml | 55 |
1 files changed, 13 insertions, 42 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 26c16deb98..68f02fcb6c 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -245,7 +245,7 @@ </refsect1> <refsect1> - <title>Unit load path</title> + <title>Unit Load Path</title> <para>Unit files are loaded from a set of paths determined during compilation, described in the two @@ -254,7 +254,7 @@ 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 @@ -278,14 +278,11 @@ <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> + <entry>Local configuration</entry> </row> <row> <entry><filename>/run/systemd/systemd</filename></entry> @@ -293,26 +290,19 @@ </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> - <entry><filename>&systemunitdir;</filename></entry> - <entry>Systemd package configuration</entry> - </row> - <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> - <entry>Generated units</entry> + <entry>Generated units (late)</entry> </row> </tbody> </tgroup> @@ -335,14 +325,11 @@ <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> + <entry>Local configuration</entry> </row> <row> <entry><filename>/run/systemd/user</filename></entry> @@ -350,40 +337,24 @@ </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> - <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> - <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> - <entry>Generated units</entry> + <entry>Generated units (late)</entry> </row> </tbody> </tgroup> </table> - <para>Note: the paths listed above are set at - compilation time and differ between distributions. The - "authoritative" 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 |