diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-25 00:26:09 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-04-07 13:30:47 -0400 |
| commit | e3641a55147a3ecbfd068d8639ecbc1a3951c956 (patch) | |
| tree | c5c7fda610a0c3008345bcb29a12bd446e4f98cc /man | |
| parent | e639faaa6f3fca2a8ac00c7bc3e28f8ef25fa39e (diff) | |
man: be more specific when EnvironmentFile= is read
http://lists.freedesktop.org/archives/systemd-devel/2014-March/018004.html
(cherry picked from commit 905826156de95d173b26e7a57df29188a1020cd0)
(cherry picked from commit 72e86f001d139f9a7deaa697e355e5df2cb31151)
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.exec.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index d8dab36f3..37b9c4d1d 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 |