summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-02-10 12:47:38 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-02-10 12:47:38 +0000
commit04c67a78eec41efdc2c051c651a3a5c5f7508b16 (patch)
tree55dc778f4bb96850173600939febb0bcda8df5c5
parente910005b1a337093109af29c7bf21b32c343ab56 (diff)
downloads6-04c67a78eec41efdc2c051c651a3a5c5f7508b16.tar.xz
more accurate timeout-kill doc
-rw-r--r--doc/servicedir.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/servicedir.html b/doc/servicedir.html
index 16fe84f..31bf751 100644
--- a/doc/servicedir.html
+++ b/doc/servicedir.html
@@ -130,7 +130,8 @@ triggered. </li>
<li style="margin-bottom:1em"> An optional regular file named <tt>timeout-kill</tt>. If such a file
exists, it must only contain an unsigned integer <em>t</em>. If <em>t</em>
is nonzero, then on receipt of a <a href="s6-svc.html">s6-svc -d</a> command,
-which sends a SIGTERM and a SIGCONT to the service, a timeout of <em>t</em>
+which sends a SIGTERM (by default, see <tt>down-signal</tt> below) and a
+SIGCONT to the service, a timeout of <em>t</em>
milliseconds is set; and if the service is still not dead after <em>t</em>
milliseconds, then it is sent a SIGKILL. If <tt>timeout-kill</tt> does not
exist, or contains 0 or an invalid value, then the service is never