summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-01-29 16:53:13 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2016-01-29 16:53:13 +0100
commit7d82cd4d53f88402edc923f5020c9ad22f9dc154 (patch)
treec9f3720bd3ec806b219ff85147d7678434073dc3 /man
parent0e3a930a60de12a54419b19484183bf6df92548e (diff)
parentae0a5fb1e14c9871ada1eac09cbe01021814d342 (diff)
Merge pull request #2474 from poettering/doc-fix-2189
man: document special considerations when mixing templated service un…
Diffstat (limited to 'man')
-rw-r--r--man/systemd.resource-control.xml6
-rw-r--r--man/systemd.service.xml10
2 files changed, 16 insertions, 0 deletions
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index b1106c759d..b6b38fde58 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -459,6 +459,12 @@
this setting is the parent slice. Since the name of a slice
unit implies the parent slice, it is hence redundant to ever
set this parameter directly for slice units.</para>
+
+ <para>Special care should be taken when relying on the default slice assignment in templated service units
+ that have <varname>DefaultDependencies=no</varname> set, see
+ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, section
+ "Automatic Dependencies" for details.</para>
+
</listitem>
</varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b998a1f81f..d7b19ee27f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -113,6 +113,16 @@
involved with early boot or late system shutdown should disable
this option.</para>
+ <para>Instanced service units (i.e. service units with an <literal>@</literal> in their name) are assigned by
+ default a per-template slice unit (see
+ <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>), named after the
+ template unit, containing all instances of the specific template. This slice is normally stopped at shutdown,
+ together with all template instances. If that is not desired, set <varname>DefaultDependencies=no</varname> in the
+ template unit, and either define your own per-template slice unit file that also sets
+ <varname>DefaultDependencies=no</varname>, or set <varname>Slice=system.slice</varname> (or another suitable slice)
+ in the template unit. Also see
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
<para>Additional implicit dependencies may be added as result of
execution and resource control parameters as documented in
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>