summaryrefslogtreecommitdiff
path: root/doc/s6-rc-oneshot-run.html
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-03-23 14:34:16 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-03-23 14:34:16 +0000
commit543c1405653c48d23e19d03d7c62e9534fc9a110 (patch)
treefe8e0c8d29ec5312c4b62cc87a7f21a43e42e155 /doc/s6-rc-oneshot-run.html
parentc59874cf6426522ec4caa7b88b23f477ef2a5967 (diff)
downloads6-rc-543c1405653c48d23e19d03d7c62e9534fc9a110.tar.xz
Don't wait on locks by default (fail instead); add a -b option to get the waiting behaviour
Also fix a few types in s6-rc-compile (unsigned int -> uint32_t for avltree indices)
Diffstat (limited to 'doc/s6-rc-oneshot-run.html')
-rw-r--r--doc/s6-rc-oneshot-run.html7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/s6-rc-oneshot-run.html b/doc/s6-rc-oneshot-run.html
index 351e9e1..8cddcb5 100644
--- a/doc/s6-rc-oneshot-run.html
+++ b/doc/s6-rc-oneshot-run.html
@@ -33,7 +33,7 @@ in internal scripts created by
<h2> Interface </h2>
<pre>
- s6-rc-oneshot-run [ -l <em>live</em> ] up|down <em>n</em>
+ s6-rc-oneshot-run [ -l <em>live</em> ] [ -b ] up|down <em>n</em>
</pre>
<ul>
@@ -49,6 +49,11 @@ live directory). </li>
<li> <tt>-l&nbsp;<em>live</em></tt>&nbsp;: use the live directory in
<em>live</em>. Default is <tt>/run/s6-rc</tt>, or what was given to the
<tt>--livedir</tt> configure option at compile time. </li>
+ <li> <tt>-b</tt>&nbsp;: blocking lock. If the service database is currently
+being used by another program, s6-rc-oneshot-run will wait until that
+other program has released its lock on the database, then proceed.
+By default, s6-rc-oneshot-run fails with an error message if the database
+is currently in use. </li>
</ul>
<h2> Exit codes </h2>