forked from pool/systemd
d24108b9c9
- Add several upstream bugfix patches which are missed: * 0018-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch * 0026-udevadm.xml-document-resolve-names-option-for-test.patch * 0030-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch * 0032-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch * 0031-man-document-the-b-special-boot-option.patch * 0033-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch * 0034-systemd-python-fix-booted-and-add-two-functions-to-d.patch * 0035-activate-mention-E-in-the-help-text.patch * 0036-activate-fix-crash-when-s-is-passed.patch * 0037-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch * 0038-core-socket-fix-SO_REUSEPORT.patch * 0039-journal-when-appending-to-journal-file-allocate-larg.patch * 0040-journal-optimize-bisection-logic-a-bit-by-caching-th.patch * 0041-journal-fix-iteration-when-we-go-backwards-from-the-.patch * 0042-journal-allow-journal_file_copy_entry-to-work-on-non.patch * 0043-journal-simplify-pre-allocation-logic.patch * 0044-journald-mention-how-long-we-needed-to-flush-to-var-.patch * 0046-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch * 0047-docs-remove-unneeded-the-s-in-gudev-docs.patch * 0048-man-explicitly-say-when-multiple-units-can-be-specif.patch * 0049-systemd-treat-reload-failure-as-failure.patch - Add patch 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch to avoid potential NULL pointer - Reorder patches to reflect udev/systemd usage - don't build bash-completions for bootstrap package - add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/request/show/222383 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=176
239 lines
13 KiB
Diff
239 lines
13 KiB
Diff
From 6a44e50f4c0938b0ba355fff21add6c067cd9837 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Sat, 30 Nov 2013 21:23:01 -0500
|
|
Subject: [PATCH] man: explicitly say when multiple units can be specified
|
|
|
|
itistoday> how do you specify multiple dependencies in a unit file? i've been
|
|
googling and can't find this basic thing :-\
|
|
itistoday> do you use a comma, or use multiple After= statements?
|
|
---
|
|
man/systemd.unit.xml | 128 +++++++++++++++++++++++++++-----------------------
|
|
1 file changed, 70 insertions(+), 58 deletions(-)
|
|
|
|
diff --git man/systemd.unit.xml man/systemd.unit.xml
|
|
index 4dc427c..35dd4c7 100644
|
|
--- man/systemd.unit.xml
|
|
+++ man/systemd.unit.xml
|
|
@@ -410,10 +410,12 @@
|
|
of the other units gets deactivated or
|
|
its activation fails, this unit will
|
|
be deactivated. This option may be
|
|
- specified more than once, in which
|
|
- case requirement dependencies for all
|
|
- listed names are created. Note that
|
|
- requirement dependencies do not
|
|
+ specified more than once or multiple
|
|
+ space-separated units may be specified
|
|
+ in one option in which case
|
|
+ requirement dependencies for all
|
|
+ listed names will be created. Note
|
|
+ that requirement dependencies do not
|
|
influence the order in which services
|
|
are started or stopped. This has to be
|
|
configured independently with the
|
|
@@ -476,22 +478,23 @@
|
|
<term><varname>RequisiteOverridable=</varname></term>
|
|
|
|
<listitem><para>Similar to
|
|
- <varname>Requires=</varname>
|
|
- and <varname>RequiresOverridable=</varname>, respectively. However,
|
|
- if a unit listed here is not started
|
|
- already it will not be started and the
|
|
- transaction fails
|
|
- immediately.</para></listitem>
|
|
+ <varname>Requires=</varname> and
|
|
+ <varname>RequiresOverridable=</varname>,
|
|
+ respectively. However, if the units
|
|
+ listed here are not started already
|
|
+ they will not be started and the
|
|
+ transaction will fail immediately.
|
|
+ </para></listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
<term><varname>Wants=</varname></term>
|
|
|
|
<listitem><para>A weaker version of
|
|
- <varname>Requires=</varname>. A unit
|
|
+ <varname>Requires=</varname>. Units
|
|
listed in this option will be started
|
|
if the configuring unit is. However,
|
|
- if the listed unit fails to start up
|
|
+ if the listed units fail to start
|
|
or cannot be added to the transaction
|
|
this has no impact on the validity of
|
|
the transaction as a whole. This is
|
|
@@ -501,8 +504,8 @@
|
|
|
|
<para>Note that dependencies of this
|
|
type may also be configured outside of
|
|
- the unit configuration file by
|
|
- adding a symlink to a
|
|
+ the unit configuration file by adding
|
|
+ symlinks to a
|
|
<filename>.wants/</filename> directory
|
|
accompanying the unit file. For
|
|
details see above.</para></listitem>
|
|
@@ -534,7 +537,7 @@
|
|
of units. When systemd stops or restarts
|
|
the units listed here, the action is
|
|
propagated to this unit.
|
|
- Note that this is a one way dependency -
|
|
+ Note that this is a one way dependency —
|
|
changes to this unit do not affect the
|
|
listed units.
|
|
</para></listitem>
|
|
@@ -543,12 +546,12 @@
|
|
<varlistentry>
|
|
<term><varname>Conflicts=</varname></term>
|
|
|
|
- <listitem><para>Configures negative
|
|
+ <listitem><para>A space-separated list
|
|
+ of unit names. Configures negative
|
|
requirement dependencies. If a unit
|
|
- has a
|
|
- <varname>Conflicts=</varname> setting
|
|
- on another unit, starting the former
|
|
- will stop the latter and vice
|
|
+ has a <varname>Conflicts=</varname>
|
|
+ setting on another unit, starting the
|
|
+ former will stop the latter and vice
|
|
versa. Note that this setting is
|
|
independent of and orthogonal to the
|
|
<varname>After=</varname> and
|
|
@@ -575,7 +578,8 @@
|
|
<term><varname>Before=</varname></term>
|
|
<term><varname>After=</varname></term>
|
|
|
|
- <listitem><para>Configures ordering
|
|
+ <listitem><para>A space-separated list
|
|
+ of unit names. Configures ordering
|
|
dependencies between units. If a unit
|
|
<filename>foo.service</filename>
|
|
contains a setting
|
|
@@ -624,18 +628,18 @@
|
|
type <varname>After=</varname> or
|
|
<varname>Before=</varname>. If two
|
|
units have no ordering dependencies
|
|
- between them, they are shut down
|
|
- or started up simultaneously, and
|
|
- no ordering takes
|
|
+ between them, they are shut down or
|
|
+ started up simultaneously, and no
|
|
+ ordering takes
|
|
place. </para></listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
<term><varname>OnFailure=</varname></term>
|
|
|
|
- <listitem><para>Lists one or more
|
|
- units that are activated when this
|
|
- unit enters the
|
|
+ <listitem><para>A space-separated list
|
|
+ of one or more units that are
|
|
+ activated when this unit enters the
|
|
<literal>failed</literal>
|
|
state.</para></listitem>
|
|
</varlistentry>
|
|
@@ -644,16 +648,17 @@
|
|
<term><varname>PropagatesReloadTo=</varname></term>
|
|
<term><varname>ReloadPropagatedFrom=</varname></term>
|
|
|
|
- <listitem><para>Lists one or more
|
|
- units where reload requests on the
|
|
- unit will be propagated to/on the
|
|
- other unit will be propagated
|
|
- from. Issuing a reload request on a
|
|
- unit will automatically also enqueue a
|
|
- reload request on all units that the
|
|
- reload request shall be propagated to
|
|
- via these two
|
|
- settings.</para></listitem>
|
|
+ <listitem><para>A space-separated list
|
|
+ of one or more units where reload
|
|
+ requests on this unit will be
|
|
+ propagated to, or reload requests on
|
|
+ the other unit will be propagated to
|
|
+ this unit, respectively. Issuing a
|
|
+ reload request on a unit will
|
|
+ automatically also enqueue a reload
|
|
+ request on all units that the reload
|
|
+ request shall be propagated to via
|
|
+ these two settings.</para></listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
@@ -1130,32 +1135,34 @@
|
|
<varlistentry>
|
|
<term><varname>Alias=</varname></term>
|
|
|
|
- <listitem><para>Additional names this
|
|
- unit shall be installed under. The
|
|
- names listed here must have the same
|
|
- suffix (i.e. type) as the unit file
|
|
- name. This option may be specified
|
|
- more than once, in which case all
|
|
- listed names are used. At installation
|
|
- time,
|
|
- <command>systemctl enable</command>
|
|
- will create symlinks from these names
|
|
- to the unit filename.</para></listitem>
|
|
+ <listitem><para>A space-seperated list
|
|
+ of additional names this unit shall be
|
|
+ installed under. The names listed here
|
|
+ must have the same suffix (i.e. type)
|
|
+ as the unit file name. This option may
|
|
+ be specified more than once, in which
|
|
+ case all listed names are used. At
|
|
+ installation time, <command>systemctl
|
|
+ enable</command> will create symlinks
|
|
+ from these names to the unit
|
|
+ filename.</para></listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
<term><varname>WantedBy=</varname></term>
|
|
<term><varname>RequiredBy=</varname></term>
|
|
|
|
- <listitem><para>A symbolic link is
|
|
- created in the
|
|
- <filename>.wants/</filename> or
|
|
- <filename>.requires/</filename> directory
|
|
- of the listed unit when this unit is
|
|
- activated by <command>systemctl
|
|
- enable</command>. This has the effect
|
|
- that a dependency of type
|
|
- <varname>Wants=</varname> or
|
|
+ <listitem><para>This option may be
|
|
+ used more than once, or a
|
|
+ space-separated list of unit names may
|
|
+ be given. A symbolic link is created
|
|
+ in the <filename>.wants/</filename> or
|
|
+ <filename>.requires/</filename>
|
|
+ directory of each of the listed units
|
|
+ when this unit is installed by
|
|
+ <command>systemctl enable</command>.
|
|
+ This has the effect that a dependency
|
|
+ of type <varname>Wants=</varname> or
|
|
<varname>Requires=</varname> is added
|
|
from the listed unit to the current
|
|
unit. The primary result is that the
|
|
@@ -1201,7 +1208,12 @@
|
|
and <command>systemctl
|
|
disable</command> will automatically
|
|
install/uninstall units listed in this option as
|
|
- well.</para></listitem>
|
|
+ well.</para>
|
|
+
|
|
+ <para>This option may be used more
|
|
+ than once, or a space-separated list
|
|
+ of unit names may be
|
|
+ given.</para></listitem>
|
|
</varlistentry>
|
|
</variablelist>
|
|
|
|
--
|
|
1.7.9.2
|
|
|