daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
65878a
From 521519ead8bb49d2c94aed90982ffcd6d5e34e92 Mon Sep 17 00:00:00 2001
65878a
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
65878a
Date: Sat, 30 Nov 2013 21:23:01 -0500
65878a
Subject: [PATCH] man: explicitly say when multiple units can be specified
65878a
65878a
itistoday> how do you specify multiple dependencies in a unit file? i've been
65878a
           googling and can't find this basic thing :-\
65878a
itistoday> do you use a comma, or use multiple After= statements?
65878a
---
65878a
 man/systemd.unit.xml | 128 ++++++++++++++++++++++++++++-----------------------
65878a
 1 file changed, 70 insertions(+), 58 deletions(-)
65878a
65878a
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
65878a
index 5c8b8e8..029392c 100644
65878a
--- a/man/systemd.unit.xml
65878a
+++ b/man/systemd.unit.xml
65878a
@@ -410,10 +410,12 @@
65878a
                                 of the other units gets deactivated or
65878a
                                 its activation fails, this unit will
65878a
                                 be deactivated. This option may be
65878a
-                                specified more than once, in which
65878a
-                                case requirement dependencies for all
65878a
-                                listed names are created. Note that
65878a
-                                requirement dependencies do not
65878a
+                                specified more than once or multiple
65878a
+                                space-separated units may be specified
65878a
+                                in one option in which case
65878a
+                                requirement dependencies for all
65878a
+                                listed names will be created. Note
65878a
+                                that requirement dependencies do not
65878a
                                 influence the order in which services
65878a
                                 are started or stopped. This has to be
65878a
                                 configured independently with the
65878a
@@ -476,22 +478,23 @@
65878a
                                 <term><varname>RequisiteOverridable=</varname></term>
65878a
 
65878a
                                 <listitem><para>Similar to
65878a
-                                <varname>Requires=</varname>
65878a
-                                and <varname>RequiresOverridable=</varname>, respectively. However,
65878a
-                                if a unit listed here is not started
65878a
-                                already it will not be started and the
65878a
-                                transaction fails
65878a
-                                immediately.</para></listitem>
65878a
+                                <varname>Requires=</varname> and
65878a
+                                <varname>RequiresOverridable=</varname>,
65878a
+                                respectively. However, if the units
65878a
+                                listed here are not started already
65878a
+                                they will not be started and the
65878a
+                                transaction will fail immediately.
65878a
+                                </para></listitem>
65878a
                         </varlistentry>
65878a
 
65878a
                         <varlistentry>
65878a
                                 <term><varname>Wants=</varname></term>
65878a
 
65878a
                                 <listitem><para>A weaker version of
65878a
-                                <varname>Requires=</varname>. A unit
65878a
+                                <varname>Requires=</varname>. Units
65878a
                                 listed in this option will be started
65878a
                                 if the configuring unit is. However,
65878a
-                                if the listed unit fails to start up
65878a
+                                if the listed units fail to start
65878a
                                 or cannot be added to the transaction
65878a
                                 this has no impact on the validity of
65878a
                                 the transaction as a whole. This is
65878a
@@ -501,8 +504,8 @@
65878a
 
65878a
                                 <para>Note that dependencies of this
65878a
                                 type may also be configured outside of
65878a
-                                the unit configuration file by
65878a
-                                adding a symlink to a
65878a
+                                the unit configuration file by adding
65878a
+                                symlinks to a
65878a
                                 <filename>.wants/</filename> directory
65878a
                                 accompanying the unit file. For
65878a
                                 details see above.</para></listitem>
65878a
@@ -534,7 +537,7 @@
65878a
                                 of units. When systemd stops or restarts
65878a
                                 the units listed here, the action is
65878a
                                 propagated to this unit.
65878a
-                                Note that this is a one way dependency -
65878a
+                                Note that this is a one way dependency —
65878a
                                 changes to this unit do not affect the
65878a
                                 listed units.
65878a
                                 </para></listitem>
65878a
@@ -543,12 +546,12 @@
65878a
                         <varlistentry>
65878a
                                 <term><varname>Conflicts=</varname></term>
65878a
 
65878a
-                                <listitem><para>Configures negative
65878a
+                                <listitem><para>A space-separated list
65878a
+                                of unit names. Configures negative
65878a
                                 requirement dependencies. If a unit
65878a
-                                has a
65878a
-                                <varname>Conflicts=</varname> setting
65878a
-                                on another unit, starting the former
65878a
-                                will stop the latter and vice
65878a
+                                has a <varname>Conflicts=</varname>
65878a
+                                setting on another unit, starting the
65878a
+                                former will stop the latter and vice
65878a
                                 versa. Note that this setting is
65878a
                                 independent of and orthogonal to the
65878a
                                 <varname>After=</varname> and
65878a
@@ -575,7 +578,8 @@
65878a
                                 <term><varname>Before=</varname></term>
65878a
                                 <term><varname>After=</varname></term>
65878a
 
65878a
-                                <listitem><para>Configures ordering
65878a
+                                <listitem><para>A space-separated list
65878a
+                                of unit names. Configures ordering
65878a
                                 dependencies between units. If a unit
65878a
                                 <filename>foo.service</filename>
65878a
                                 contains a setting
65878a
@@ -624,18 +628,18 @@
65878a
                                 type <varname>After=</varname> or
65878a
                                 <varname>Before=</varname>. If two
65878a
                                 units have no ordering dependencies
65878a
-                                between them, they are shut down
65878a
-                                or started up simultaneously, and
65878a
-                                no ordering takes
65878a
+                                between them, they are shut down or
65878a
+                                started up simultaneously, and no
65878a
+                                ordering takes
65878a
                                 place. </para></listitem>
65878a
                         </varlistentry>
65878a
 
65878a
                         <varlistentry>
65878a
                                 <term><varname>OnFailure=</varname></term>
65878a
 
65878a
-                                <listitem><para>Lists one or more
65878a
-                                units that are activated when this
65878a
-                                unit enters the
65878a
+                                <listitem><para>A space-separated list
65878a
+                                of one or more units that are
65878a
+                                activated when this unit enters the
65878a
                                 <literal>failed</literal>
65878a
                                 state.</para></listitem>
65878a
                         </varlistentry>
65878a
@@ -644,16 +648,17 @@
65878a
                                 <term><varname>PropagatesReloadTo=</varname></term>
65878a
                                 <term><varname>ReloadPropagatedFrom=</varname></term>
65878a
 
65878a
-                                <listitem><para>Lists one or more
65878a
-                                units where reload requests on the
65878a
-                                unit will be propagated to/on the
65878a
-                                other unit will be propagated
65878a
-                                from. Issuing a reload request on a
65878a
-                                unit will automatically also enqueue a
65878a
-                                reload request on all units that the
65878a
-                                reload request shall be propagated to
65878a
-                                via these two
65878a
-                                settings.</para></listitem>
65878a
+                                <listitem><para>A space-separated list
65878a
+                                of one or more units where reload
65878a
+                                requests on this unit will be
65878a
+                                propagated to, or reload requests on
65878a
+                                the other unit will be propagated to
65878a
+                                this unit, respectively. Issuing a
65878a
+                                reload request on a unit will
65878a
+                                automatically also enqueue a reload
65878a
+                                request on all units that the reload
65878a
+                                request shall be propagated to via
65878a
+                                these two settings.</para></listitem>
65878a
                         </varlistentry>
65878a
 
65878a
                         <varlistentry>
65878a
@@ -1089,32 +1094,34 @@
65878a
                         <varlistentry>
65878a
                                 <term><varname>Alias=</varname></term>
65878a
 
65878a
-                                <listitem><para>Additional names this
65878a
-                                unit shall be installed under. The
65878a
-                                names listed here must have the same
65878a
-                                suffix (i.e. type) as the unit file
65878a
-                                name. This option may be specified
65878a
-                                more than once, in which case all
65878a
-                                listed names are used. At installation
65878a
-                                time,
65878a
-                                <command>systemctl enable</command>
65878a
-                                will create symlinks from these names
65878a
-                                to the unit filename.</para></listitem>
65878a
+                                <listitem><para>A space-seperated list
65878a
+                                of additional names this unit shall be
65878a
+                                installed under. The names listed here
65878a
+                                must have the same suffix (i.e. type)
65878a
+                                as the unit file name. This option may
65878a
+                                be specified more than once, in which
65878a
+                                case all listed names are used. At
65878a
+                                installation time, <command>systemctl
65878a
+                                enable</command> will create symlinks
65878a
+                                from these names to the unit
65878a
+                                filename.</para></listitem>
65878a
                         </varlistentry>
65878a
 
65878a
                         <varlistentry>
65878a
                                 <term><varname>WantedBy=</varname></term>
65878a
                                 <term><varname>RequiredBy=</varname></term>
65878a
 
65878a
-                                <listitem><para>A symbolic link is
65878a
-                                created in the
65878a
-                                <filename>.wants/</filename> or
65878a
-                                <filename>.requires/</filename> directory
65878a
-                                of the listed unit when this unit is
65878a
-                                activated by <command>systemctl
65878a
-                                enable</command>.  This has the effect
65878a
-                                that a dependency of type
65878a
-                                <varname>Wants=</varname> or
65878a
+                                <listitem><para>This option may be
65878a
+                                used more than once, or a
65878a
+                                space-separated list of unit names may
65878a
+                                be given. A symbolic link is created
65878a
+                                in the <filename>.wants/</filename> or
65878a
+                                <filename>.requires/</filename>
65878a
+                                directory of each of the listed units
65878a
+                                when this unit is installed by
65878a
+                                <command>systemctl enable</command>.
65878a
+                                This has the effect that a dependency
65878a
+                                of type <varname>Wants=</varname> or
65878a
                                 <varname>Requires=</varname> is added
65878a
                                 from the listed unit to the current
65878a
                                 unit. The primary result is that the
65878a
@@ -1160,7 +1167,12 @@
65878a
                                 and <command>systemctl
65878a
                                 disable</command> will automatically
65878a
                                 install/uninstall units listed in this option as
65878a
-                                well.</para></listitem>
65878a
+                                well.</para>
65878a
+
65878a
+                                <para>This option may be used more
65878a
+                                than once, or a space-separated list
65878a
+                                of unit names may be
65878a
+                                given.</para></listitem>
65878a
                         </varlistentry>
65878a
                 </variablelist>
65878a