diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-23 14:34:16 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-23 14:34:16 +0000 |
commit | 543c1405653c48d23e19d03d7c62e9534fc9a110 (patch) | |
tree | fe8e0c8d29ec5312c4b62cc87a7f21a43e42e155 /doc/s6-rc-update.html | |
parent | c59874cf6426522ec4caa7b88b23f477ef2a5967 (diff) | |
download | s6-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-update.html')
-rw-r--r-- | doc/s6-rc-update.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/s6-rc-update.html b/doc/s6-rc-update.html index e424f98..52ab42d 100644 --- a/doc/s6-rc-update.html +++ b/doc/s6-rc-update.html @@ -38,7 +38,7 @@ situations it cannot solve. <h2> Interface </h2> <pre> - s6-rc-update [ -n ] [ -v <em>verbosity</em> ] [ -t <em>timeout</em> ] [ -l <em>live</em> ] [ -f <em>convfile</em> ] <em>newdb</em> + s6-rc-update [ -n ] [ -v <em>verbosity</em> ] [ -t <em>timeout</em> ] [ -l <em>live</em> ] [ -f <em>convfile</em> ] [ -b ] <em>newdb</em> </pre> <ul> @@ -95,6 +95,11 @@ The default can be changed at compile-time by giving the <li> <tt>-f <em>convfile</em></tt> : use the conversion file located at <em>convfile</em>. Default is <tt>/dev/null</tt>, meaning no special instructions. </li> + <li> <tt>-b</tt> : blocking lock. If the database is currently +being used by another program, s6-rc-update will wait until that +other program has released its lock on the database, then proceed. +By default, s6-rc-update fails with an error message if the database +is currently in use. </li> </ul> <h2> Transition details </h2> |