|
 |
4f94566 |
From e3641a55147a3ecbfd068d8639ecbc1a3951c956 Mon Sep 17 00:00:00 2001
|
|
|
4f94566 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
4f94566 |
Date: Tue, 25 Mar 2014 00:26:09 +0100
|
|
|
4f94566 |
Subject: [PATCH] man: be more specific when EnvironmentFile= is read
|
|
|
4f94566 |
|
|
|
4f94566 |
http://lists.freedesktop.org/archives/systemd-devel/2014-March/018004.html
|
|
|
4f94566 |
(cherry picked from commit 905826156de95d173b26e7a57df29188a1020cd0)
|
|
|
4f94566 |
(cherry picked from commit 72e86f001d139f9a7deaa697e355e5df2cb31151)
|
|
|
4f94566 |
---
|
|
|
4f94566 |
man/systemd.exec.xml | 11 ++++++++---
|
|
|
4f94566 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
4f94566 |
|
|
|
4f94566 |
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
|
|
|
4f94566 |
index d8dab36..37b9c4d 100644
|
|
|
4f94566 |
--- a/man/systemd.exec.xml
|
|
|
4f94566 |
+++ b/man/systemd.exec.xml
|
|
|
4f94566 |
@@ -340,9 +340,14 @@
|
|
|
4f94566 |
|
|
|
4f94566 |
<para>The files listed with this
|
|
|
4f94566 |
directive will be read shortly before
|
|
|
4f94566 |
- the process is executed. Settings from
|
|
|
4f94566 |
- these files override settings made
|
|
|
4f94566 |
- with
|
|
|
4f94566 |
+ the process is executed (more
|
|
|
4f94566 |
+ specifically, this means after all
|
|
|
4f94566 |
+ processes from a previous unit state
|
|
|
4f94566 |
+ terminated. This means you can
|
|
|
4f94566 |
+ generate these files in one unit
|
|
|
4f94566 |
+ state, and read it with this option in
|
|
|
4f94566 |
+ the next). Settings from these files
|
|
|
4f94566 |
+ override settings made with
|
|
|
4f94566 |
<varname>Environment=</varname>. If
|
|
|
4f94566 |
the same variable is set twice from
|
|
|
4f94566 |
these files, the files will be read in
|