daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
aed857
From 273a3d35df021128bd72e124d943cbb7b1c7194c Mon Sep 17 00:00:00 2001
aed857
From: Jan Synacek <jsynacek@redhat.com>
aed857
Date: Fri, 22 Jun 2018 09:11:49 +0200
aed857
Subject: [PATCH] man: correct the meaning of TimeoutStopSec=
aed857
aed857
Fixes: #9325
aed857
(cherry picked from commit 9a6da355a06e2b272717f2ac23e41945ce56eb6d)
aed857
Resolves: #1305509
aed857
---
aed857
 man/systemd.service.xml | 12 ++++++------
aed857
 1 file changed, 6 insertions(+), 6 deletions(-)
aed857
aed857
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
aed857
index a274db480..d147e449a 100644
aed857
--- a/man/systemd.service.xml
aed857
+++ b/man/systemd.service.xml
aed857
@@ -429,12 +429,12 @@
aed857
 
aed857
       <varlistentry>
aed857
         <term><varname>TimeoutStopSec=</varname></term>
aed857
-        <listitem><para>Configures the time to wait for stop. If a
aed857
-        service is asked to stop, but does not terminate in the
aed857
-        specified time, it will be terminated forcibly via
aed857
-        <constant>SIGTERM</constant>, and after another timeout of
aed857
-        equal duration with <constant>SIGKILL</constant> (see
aed857
-        <varname>KillMode=</varname> in
aed857
+        <listitem><para>This option serves two purposes. First, it configures the time to wait for each
aed857
+        <constant>ExecStop=</constant> command. If any of them times out, subsequent <constant>ExecStop=</constant> commands
aed857
+        are skipped and the service will be terminated by <constant>SIGTERM</constant>. If no <constant>ExecStop=</constant>
aed857
+        commands are specified, the service gets the <constant>SIGTERM</constant> immediately. Second, it configures the time
aed857
+        to wait for the service itself to stop. If it doesn't terminate in the specified time, it will be forcibly terminated
aed857
+        by <constant>SIGKILL</constant> (see <varname>KillMode=</varname> in
aed857
         <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
aed857
         Takes a unit-less value in seconds, or a time span value such
aed857
         as "5min 20s". Pass <literal>0</literal> to disable the