aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Synacek <jsynacek@redhat.com>2018-06-22 09:11:49 +0200
committerLennart Poettering <lennart@poettering.net>2018-06-22 12:56:28 +0200
commit9a6da355a06e2b272717f2ac23e41945ce56eb6d (patch)
tree3c14323b2e1b9e61427149d5bd4360495604393b
parenttmpfile: do not specify mode and owner to /run/systemd/netif (diff)
downloadsystemd-9a6da355a06e2b272717f2ac23e41945ce56eb6d.tar.xz
systemd-9a6da355a06e2b272717f2ac23e41945ce56eb6d.zip
man: correct the meaning of TimeoutStopSec= (#9325)
Fixes: #9325
-rw-r--r--man/systemd.service.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index afa0ae4115a..add54524cee 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -522,12 +522,12 @@
<varlistentry>
<term><varname>TimeoutStopSec=</varname></term>
- <listitem><para>Configures the time to wait for stop. If a
- service is asked to stop, but does not terminate in the
- specified time, it will be terminated forcibly via
- <constant>SIGTERM</constant>, and after another timeout of
- equal duration with <constant>SIGKILL</constant> (see
- <varname>KillMode=</varname> in
+ <listitem><para>This option serves two purposes. First, it configures the time to wait for each
+ <constant>ExecStop=</constant> command. If any of them times out, subsequent <constant>ExecStop=</constant> commands
+ are skipped and the service will be terminated by <constant>SIGTERM</constant>. If no <constant>ExecStop=</constant>
+ commands are specified, the service gets the <constant>SIGTERM</constant> immediately. Second, it configures the time
+ to wait for the service itself to stop. If it doesn't terminate in the specified time, it will be forcibly terminated
+ by <constant>SIGKILL</constant> (see <varname>KillMode=</varname> in
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
Takes a unit-less value in seconds, or a time span value such
as "5min 20s". Pass <literal>infinity</literal> to disable the