summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2016-07-15 04:20:45 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-07-14 22:20:45 -0400
commitf749954d924dc126fd3b8a5539b537ddb1a07f71 (patch)
treeaa23d8f5bbfc9d5d9f44f0198dcf0c4e20f8f670
parent20f873deb285d4b67d1da67360fa684a32daea72 (diff)
correct information about implicit dependencies (#3730)
systemd.special.xml: corrections about implicit dependencies for basic.target, sysinit.target and shutdown.target. systemd.target.xml: corrections about implicit dependencies for target units in general.
-rw-r--r--man/systemd.special.xml16
-rw-r--r--man/systemd.target.xml19
2 files changed, 25 insertions, 10 deletions
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 9d79315069..18ad8f92e5 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -127,9 +127,9 @@
<listitem>
<para>A special target unit covering basic boot-up.</para>
- <para>systemd automatically adds dependencies of the types
- <varname>Requires=</varname> and <varname>After=</varname>
- for this target unit to all services (except for those with
+ <para>systemd automatically adds dependency of the type
+ <varname>After=</varname> for this target unit to all
+ services (except for those with
<varname>DefaultDependencies=no</varname>).</para>
<para>Usually, this should pull-in all local mount points plus
@@ -509,8 +509,9 @@
system shutdown.</para>
<para>Services that shall be terminated on system shutdown
- shall add <varname>Conflicts=</varname> dependencies to this
- unit for their service unit, which is implicitly done when
+ shall add <varname>Conflicts=</varname> and
+ <varname>Before=</varname> dependencies to this unit for
+ their service unit, which is implicitly done when
<varname>DefaultDependencies=yes</varname> is set (the
default).</para>
</listitem>
@@ -579,6 +580,11 @@
<varlistentry>
<term><filename>sysinit.target</filename></term>
<listitem>
+ <para>systemd automatically adds dependencies of the types
+ <varname>Requires=</varname> and <varname>After=</varname>
+ for this target unit to all services (except for those with
+ <varname>DefaultDependencies=no</varname>).</para>
+
<para>This target pulls in the services required for system
initialization. System services pulled in by this target should
declare <varname>DefaultDependencies=no</varname> and specify
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index ab910d75dd..645d8493c1 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -82,11 +82,20 @@
<refsect1>
<title>Automatic Dependencies</title>
- <para>Unless <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> section is set to
- <option>no</option>, target units will implicitly complement all configured dependencies of type
- <varname>Wants=</varname>, <varname>Requires=</varname> with dependencies of type <varname>After=</varname>, unless
- an ordering dependency of any kind between the target and the respective other unit is already in place. Note that
- this behaviour is disabled if either unit has <varname>DefaultDependencies=no</varname>.</para>
+ <para>Unless <varname>DefaultDependencies=</varname> is set to
+ <option>no</option> in either of releated units or an explicit ordering
+ dependency is already defined, target units will implicitly complement all
+ configured dependencies of type <varname>Wants=</varname> or
+ <varname>Requires=</varname> with dependencies of type
+ <varname>After=</varname>. Note that <varname>Wants=</varname> or
+ <varname>Requires=</varname> must be defined in the target unit itself - if
+ you for example define <varname>Wants=</varname>some.target in
+ some.service, the implicit ordering will not be added.</para>
+
+ <para>All target units automatically gain <varname>Conflicts=</varname>
+ dependency against shutdown.target unless <varname>DefaultDependencies=</varname>
+ is set to <option>no</option>.</para>
+
</refsect1>
<refsect1>