summaryrefslogtreecommitdiff
path: root/man/systemd.generator.xml
diff options
context:
space:
mode:
authorJohn Lin <johnlinp@gmail.com>2017-10-18 14:29:19 +0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-10-18 08:29:19 +0200
commit4b4a972d2e4b250ff074dc224864481cdd349790 (patch)
treef2a775915ea8e9013eceaa95924c08d4c089af1c /man/systemd.generator.xml
parent6acbbdd4da2d072112042abbce8c0a9523beed4e (diff)
downloadsystemd-4b4a972d2e4b250ff074dc224864481cdd349790.tar.gz
man: mention /run in systemd.generator document (#7121)
Diffstat (limited to 'man/systemd.generator.xml')
-rw-r--r--man/systemd.generator.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index fb0f0c4da8..a6af5f724c 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -122,7 +122,8 @@
<para><parameter>normal-dir</parameter></para>
<para>argv[1] may be used to override unit files in
<filename>/usr</filename>, but not those in
- <filename>/etc</filename>. This means that unit files placed
+ <filename>/run</filename> or in <filename>/etc</filename>.
+ This means that unit files placed
in this directory take precedence over vendor unit
configuration but not over native user/administrator unit
configuration.</para>
@@ -131,7 +132,7 @@
<listitem>
<para><parameter>early-dir</parameter></para>
<para>argv[2] may be used to override unit files in
- <filename>/usr</filename> and in
+ <filename>/usr</filename>, in <filename>/run</filename> and in
<filename>/etc</filename>. This means that unit files placed
in this directory take precedence over all configuration,
both vendor and user/administrator.</para>