diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-06-13 13:57:10 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-06-13 13:57:10 +0000 |
| commit | 257cfa44628e5e1e5bfb5cf16cfb23c9bd29ec96 (patch) | |
| tree | 91b26cafe9e9a98d64fdc2f09585cfa07d390b9d /doc/servicedir.html | |
| parent | ff147a1493759c0662912564c0ecd26f59590322 (diff) | |
| download | s6-257cfa44628e5e1e5bfb5cf16cfb23c9bd29ec96.tar.xz | |
Doc fix (lock-fd)
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc/servicedir.html')
| -rw-r--r-- | doc/servicedir.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/servicedir.html b/doc/servicedir.html index 75f08f9..2ced33e 100644 --- a/doc/servicedir.html +++ b/doc/servicedir.html @@ -155,8 +155,8 @@ copies of the service in case something goes wrong: for instance, the service backgrounds itself (which it shouldn't do when running under a supervision suite), or s6-supervise is killed, restarted by s6-svscan, and attempts to start another copy of the service while the first copy is still alive. If s6-supervise detects that the lock -is held when it tries to start the service, it will print a warning message and delay -the starting attempt for 60 seconds. </li> +is held when it tries to start the service, it will print a warning message; the new +service instance will block until the lock is released, then proceed as usual. </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> |