chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa16713
)
man: document changed EnvironmentFile= behaviour
author
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 13:13:47 +0000
(14:13 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 4 Mar 2011 13:13:47 +0000
(14:13 +0100)
man/systemd.exec.xml
patch
|
blob
|
history
diff --git
a/man/systemd.exec.xml
b/man/systemd.exec.xml
index 1f79e1e19b01dbe2d45aa098790eb571a38850a8..f96d181a9e83ad82358dfe510f8a5955df70b674 100644
(file)
--- a/
man/systemd.exec.xml
+++ b/
man/systemd.exec.xml
@@
-284,7
+284,17
@@
"-", which indicates that if the file
does not exist it won't be read and no
error or warning message is
"-", which indicates that if the file
does not exist it won't be read and no
error or warning message is
- logged.</para></listitem>
+ logged. The files listed with this
+ directive will be read shortly before
+ the process is executed. 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
+ the order they are specified and the
+ later setting will override the
+ earlier setting. </para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>