man: bootchart: change /var/log to /run/log

[elogind.git] / man / systemd.exec.xml

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 71472b4f5dd308f1b6ee8fc18fdb656beab44733..952bb9595ea28987fdec55b5e5309619bf9d54a0 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -82,7 +82,7 @@
         <refsect1>
                 <title>Options</title>
 
         <refsect1>
                 <title>Options</title>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>WorkingDirectory=</varname></term>
 
                         <varlistentry>
                                 <term><varname>WorkingDirectory=</varname></term>


@@ -286,9 +286,24 @@
                                 empty string is assigned to this
                                 option the list of environment
                                 variables is reset, all prior
                                 empty string is assigned to this
                                 option the list of environment
                                 variables is reset, all prior

-                                assignments have no effect. See
+                                assignments have no effect.
+                                Variable expansion is not performed
+                                inside the strings, and $ has no special
+                                meaning.
+                                If you need to assign a value containing spaces
+                                to a variable, use double quotes (")
+                                for the assignment.</para>
+
+                                <para>Example:
+                                <programlisting>Environment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
+                                gives three variables <literal>VAR1</literal>,
+                                <literal>VAR2</literal>, <literal>VAR3</literal>.
+                                </para>
+
+                                <para>
+                                See

                                 <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                                 <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>

-                                for details.</para></listitem>
+                                for details about environment variables.</para></listitem>

                         </varlistentry>
                         <varlistentry>
                                 <term><varname>EnvironmentFile=</varname></term>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>EnvironmentFile=</varname></term>


@@ -299,9 +314,11 @@
                                 contain new-line separated variable
                                 assignments. Empty lines and lines
                                 starting with ; or # will be ignored,
                                 contain new-line separated variable
                                 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
+                                which may be used for commenting. A line
+                                ending with a backslash will be concatenated
+                                with the following one, allowing multiline variable
+                                definitions. The parser strips leading
+                                and trailing whitespace from the values

                                 of assignments, unless you use
                                 double quotes (").</para>
 
                                 of assignments, unless you use
                                 double quotes (").</para>
 


@@ -445,7 +462,7 @@
                                 with
                                 <option>DefaultStandardOutput=</option>
                                 in
                                 with
                                 <option>DefaultStandardOutput=</option>
                                 in

-                                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                                <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,

                                 which defaults to
                                 <option>journal</option>.</para></listitem>
                         </varlistentry>
                                 which defaults to
                                 <option>journal</option>.</para></listitem>
                         </varlistentry>


@@ -464,7 +481,7 @@
                                 setting defaults to the value set with
                                 <option>DefaultStandardError=</option>
                                 in
                                 setting defaults to the value set with
                                 <option>DefaultStandardError=</option>
                                 in

-                                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                                <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,

                                 which defaults to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                                 which defaults to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>


@@ -822,7 +839,7 @@
                                 settings of
                                 <varname>DefaultControllers=</varname>
                                 of
                                 settings of
                                 <varname>DefaultControllers=</varname>
                                 of

-                                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                                <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,

                                 but a unit's
                                 <varname>ControlGroup=</varname>
                                 setting for a specific controller
                                 but a unit's
                                 <varname>ControlGroup=</varname>
                                 setting for a specific controller


@@ -1079,15 +1096,17 @@
                                 <listitem><para>Takes a boolean
                                 argument. If true sets up a new file
                                 system namespace for the executed
                                 <listitem><para>Takes a boolean
                                 argument. If true sets up a new file
                                 system namespace for the executed

-                                processes and mounts a private
-                                <filename>/tmp</filename> directory
-                                inside it, that is not shared by
+                                processes and mounts private
+                                <filename>/tmp</filename> and
+                                <filename>/var/tmp</filename> directories
+                                inside it, that are not shared by

                                 processes outside of the
                                 namespace. This is useful to secure
                                 access to temporary files of the
                                 process, but makes sharing between
                                 processes via
                                 processes outside of the
                                 namespace. This is useful to secure
                                 access to temporary files of the
                                 process, but makes sharing between
                                 processes via

-                                <filename>/tmp</filename>
+                                <filename>/tmp</filename> or
+                                <filename>/var/tmp</filename>

                                 impossible. Defaults to
                                 false.</para></listitem>
                         </varlistentry>
                                 impossible. Defaults to
                                 false.</para></listitem>
                         </varlistentry>