diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-04 14:13:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-04 14:13:47 +0100 |
| commit | f1779fd27b49d7ac9e04e0e83daf5f5f3efd9d8a (patch) | |
| tree | 4ae49f2e89c84c7fd0d24e126e65fb1edc229509 /man | |
| parent | aa1671320df5bd8aa4108c0efb34a49fdedd0e5f (diff) | |
man: document changed EnvironmentFile= behaviour
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.exec.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 1f79e1e19b..f96d181a9e 100644 --- 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 - 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> |