summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Scott <barry.scott@onelan.co.uk>2011-10-03 11:50:09 +0100
committerLennart Poettering <lennart@poettering.net>2011-10-11 01:11:26 +0200
commit7734f77373a871ffb755a99b381fd93682052b8c (patch)
treef9b633331940a667fbea26f534ed2e5f7dc1b88e
parenteffe639c6a66123a7c6626cb9129f6bcbb41b3ae (diff)
man: for ExecStart= provide more details on env var substitution and how that turns into arguments.
For EnvironmentFile= explain that double quotes can be used to protect whitespace.
-rw-r--r--man/systemd.exec.xml5
-rw-r--r--man/systemd.service.xml36
2 files changed, 27 insertions, 14 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 609484b3a3..230c4a31f7 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -279,6 +279,11 @@
assignments. Empty lines and lines
starting with ; or # will be ignored,
which may be used for commenting. The
+ parser strips leading and
+ trailing whitespace from the values
+ of assignments, unless you use
+ double quotes (").
+ The
argument passed should be an absolute
file name, optionally prefixed with
"-", which indicates that if the file
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 4f1102021f..7b6f12d069 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -311,20 +311,28 @@
main process of the daemon. The
command line accepts % specifiers as
described in
- <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. On
- top of that basic environment variable
- substitution is supported, where
- <literal>${FOO}</literal> is replaced
- by the string value of the environment
- variable of the same name. Also
- <literal>$FOO</literal> may appear as
- separate word on the command line in
- which case the variable is replaced by
- its value split at whitespaces. Note
- that the first argument (i.e. the
- binary to execute) may not be a
- variable, and must be a literal and
- absolute path name.</para></listitem>
+ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+ <para>On top of that basic environment
+ variable substitution is
+ supported. Use
+ <literal>${FOO}</literal> as part of a
+ word, or as word of its own on the
+ command line, in which case it will be
+ replaced by the value of the
+ environment variable including all
+ whitespace it contains, resulting in a
+ single argument. Use
+ <literal>$FOO</literal> as a separate
+ word on the command line, in which
+ case it will be replaced by the value
+ of the environment variable split up
+ at whitespace, resulting in no or more
+ arguments. Note that the first
+ argument (i.e. the program to execute)
+ may not be a variable, and must be a
+ literal and absolute path
+ name.</para></listitem>
</varlistentry>
<varlistentry>