summaryrefslogtreecommitdiffstats
path: root/man/systemd.service.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2024-10-07 09:37:24 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-10-10 19:18:24 +0200
commitc3069a6bfb454a0e02607ad21b5badf9847fe11a (patch)
tree6dadf9f9b5b7a163fefb22076ddd99594b2a009c /man/systemd.service.xml
parentukify: Fix systemd-measure detection in tests (diff)
downloadsystemd-c3069a6bfb454a0e02607ad21b5badf9847fe11a.tar.xz
systemd-c3069a6bfb454a0e02607ad21b5badf9847fe11a.zip
man: reword comment a bit regarding ExecStartPre= multiple commands
The documentation claimed that ExecStartPre=/ExecStartPost= accepts multiple command lines, in contrast to ExecStart=. This is half an untruth, because ExecStart= allows that too – as long as Type=oneshot is set. Hence, reword this a bit, and do not emphasize the contrast. Prompted by: #34570
Diffstat (limited to '')
-rw-r--r--man/systemd.service.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 56ff4577ce..3066c91955 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -409,12 +409,11 @@
<varlistentry>
<term><varname>ExecStartPre=</varname></term>
<term><varname>ExecStartPost=</varname></term>
- <listitem><para>Additional commands that are executed before
- or after the command in <varname>ExecStart=</varname>,
- respectively. Syntax is the same as for
- <varname>ExecStart=</varname>, except that multiple command
- lines are allowed and the commands are executed one after the
- other, serially.</para>
+
+ <listitem><para>Additional commands that are executed before or after the command in
+ <varname>ExecStart=</varname>, respectively. Syntax is the same as for <varname>ExecStart=</varname>.
+ Multiple command lines are allowed, regardless of the service type (i.e. <varname>Type=</varname>),
+ and the commands are executed one after the other, serially.</para>
<para>If any of those commands (not prefixed with
<literal>-</literal>) fail, the rest are not executed and the
@@ -450,8 +449,9 @@
<varlistentry>
<term><varname>ExecCondition=</varname></term>
- <listitem><para>Optional commands that are executed before the commands in <varname>ExecStartPre=</varname>.
- Syntax is the same as for <varname>ExecStart=</varname>, except that multiple command lines are allowed and the
+ <listitem><para>Optional commands that are executed before the commands in
+ <varname>ExecStartPre=</varname>. Syntax is the same as for <varname>ExecStart=</varname>. Multiple
+ command lines are allowed, regardless of the service type (i.e. <varname>Type=</varname>), and the
commands are executed one after the other, serially.</para>
<para>The behavior is like an <varname>ExecStartPre=</varname> and condition check hybrid: when an