bus: don't generate NameAcquired/NameLost messages in the library

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

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index b43fa1369ed80991979d60e8abe0e67d9d8254cb..4dc427c305bcd5e9a7bae1e241d1eba9437728eb 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -656,6 +656,37 @@
                                 settings.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>JoinsNamespaceOf=</varname></term>
+
+                                <listitem><para>For units that start
+                                processes (such as service units),
+                                lists one or more other units whose
+                                network and/or temporary file
+                                namespace to join. This only applies
+                                to unit types which support the
+                                <varname>PrivateNetwork=</varname> and
+                                <varname>PrivateTmp=</varname>
+                                directives (see
+                                <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                                for details). If a unit that has this
+                                setting set is started its processes
+                                will see the same
+                                <filename>/tmp</filename>,
+                                <filename>/tmp/var</filename> and
+                                network namespace as one listed unit
+                                that is started. If multiple listed
+                                units are already started it is not
+                                defined which namespace is
+                                joined. Note that this setting only
+                                has an effect if
+                                <varname>PrivateNetwork=</varname>
+                                and/or <varname>PrivateTmp=</varname>
+                                is enabled for both the unit that
+                                joins the namespace and the unit whose
+                                namespace is joined.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>RequiresMountsFor=</varname></term>
 
@@ -674,28 +705,20 @@
                                 <listitem><para>Takes a value of
                                 <literal>fail</literal>,
                                 <literal>replace</literal>,
-                                <literal>replace-irreversibly</literal>
+                                <literal>replace-irreversibly</literal>,
+                                <literal>isolate</literal>,
+                                <literal>flush</literal>,
+                                <literal>ignore-dependencies</literal>
                                 or
-                                <literal>isolate</literal>. Defaults
+                                <literal>ignore-requirements</literal>. Defaults
                                 to
                                 <literal>replace</literal>. Specifies
                                 how the units listed in
                                 <varname>OnFailure=</varname> will be
-                                enqueued. If set to
-                                <literal>fail</literal> and
-                                contradicting jobs are already queued,
-                                cause the activation to fail. If set
-                                to <literal>replace</literal> and
-                                contradicting jobs area already
-                                queued, replace
-                                those. <literal>replace-irreversibly</literal>
-                                is similar to
-                                <literal>replace</literal>, however,
-                                creates jobs that cannot be reversed
-                                unless they finished or are explicitly
-                                canceled. <literal>isolate</literal>
-                                may be used to terminate all other
-                                units but the specified one. If
+                                enqueued. See
+                                <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
+                                <option>--job-mode=</option> option
+                                for details on the possible values. If
                                 this is set to
                                 <literal>isolate</literal>, only a
                                 single unit may be listed in