summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Black <danielgb@au.ibm.com>2017-12-14 15:51:23 +1100
committerYu Watanabe <watanabe.yu+github@gmail.com>2017-12-14 13:51:23 +0900
commitafbc75e686dfe108db5fda1a10e0e5670d672db5 (patch)
tree5da68e52ba649d47771737097fdcbd14081a89c2 /man
parent314a6c0083cacbb7c4845e6d7b5bf2c1d4a3cbb6 (diff)
downloadsystemd-afbc75e686dfe108db5fda1a10e0e5670d672db5.tar.gz
systemd-afbc75e686dfe108db5fda1a10e0e5670d672db5.tar.bz2
systemd-afbc75e686dfe108db5fda1a10e0e5670d672db5.zip
man: systemd.unit: move note about clearing lists (#7621)
This is mainly for drop-in files.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.unit.xml14
1 files changed, 6 insertions, 8 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 49f82c1c24..5cd8be310d 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1603,13 +1603,6 @@ ExecStart=/usr/sbin/foo-daemon
disadvantage that some future updates by the vendor might be
incompatible with the local changes.</para>
- <para>Note that for drop-in files, if one wants to remove
- entries from a setting that is parsed as a list (and is not a
- dependency), such as <varname>ConditionPathExists=</varname> (or
- e.g. <varname>ExecStart=</varname> in service units), one needs
- to first clear the list before re-adding all entries except the
- one that is to be removed. See below for an example.</para>
-
<para>This also applies for user instances of systemd, but with
different locations for the unit files. See the section on unit
load paths for further details.</para>
@@ -1681,7 +1674,12 @@ AssertPathExists=/srv/www
Nice=0
PrivateTmp=yes</programlisting>
- <para>Note that dependencies (<varname>After=</varname>, etc.)
+ <para>Note that for drop-in files, if one wants to remove
+ entries from a setting that is parsed as a list (and is not a
+ dependency), such as <varname>AssertPathExists=</varname> (or
+ e.g. <varname>ExecStart=</varname> in service units), one needs
+ to first clear the list before re-adding all entries except the
+ one that is to be removed. Dependencies (<varname>After=</varname>, etc.)
cannot be reset to an empty list, so dependencies can only be
added in drop-ins. If you want to remove dependencies, you have
to override the entire unit.</para>