summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-25 00:26:09 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-25 00:26:09 +0100
commit905826156de95d173b26e7a57df29188a1020cd0 (patch)
tree56595a3021c1dc6d903026aed6fd86e19832f0ed /man
parentd2753d220044892495769f7f9fca297cf86d01b9 (diff)
man: be more specific when EnvironmentFile= is read
http://lists.freedesktop.org/archives/systemd-devel/2014-March/018004.html
Diffstat (limited to 'man')
-rw-r--r--man/systemd.exec.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 11ad7f6605..5d39bd1a14 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -340,9 +340,14 @@
<para>The files listed with this
directive will be read shortly before
- the process is executed. Settings from
- these files override settings made
- with
+ the process is executed (more
+ specifically, this means after all
+ processes from a previous unit state
+ terminated. This means you can
+ generate these files in one unit
+ state, and read it with this option in
+ the next). Settings from these files
+ override settings made with
<varname>Environment=</varname>. If
the same variable is set twice from
these files, the files will be read in