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-bundle.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-bundle.html')
-rw-r--r-- | doc/s6-rc-bundle.html | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/s6-rc-bundle.html b/doc/s6-rc-bundle.html index 7647006..4bae71a 100644 --- a/doc/s6-rc-bundle.html +++ b/doc/s6-rc-bundle.html @@ -36,9 +36,9 @@ operation. <pre> s6-rc-bundle help - s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] add <em>bundlename</em> <em>contents...</em> - s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] delete <em>bundlenames...</em> - s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] multiple <em>args...</em> + s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] [ -b ] add <em>bundlename</em> <em>contents...</em> + s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] [ -b ] delete <em>bundlenames...</em> + s6-rc-bundle [ -f ] [ -l <em>live</em> ] [ -c <em>compiled</em> ] [ -b ] multiple <em>args...</em> </pre> <ul> @@ -66,6 +66,11 @@ when given a nonexisting name to delete (it will do nothing), or when given an existing name to add (it will replace the definition). By default, s6-rc-bundle will complain and exit when asked to delete a nonexistent name or to add an existing name. </li> + <li> <tt>-b</tt> : blocking lock. If the database is currently +being used by another program, s6-rc-bundle will wait until that +other program has released its lock on the database, then proceed. +By default, s6-rc-bundle fails with an error message if the database +is currently in use. </li> </ul> <h2> Exit codes </h2> |