diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-10-08 15:39:57 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-10-08 15:39:57 +0000 |
commit | f9940bb7d1a6ce7d7772e8cbdbbd55a321cc5c18 (patch) | |
tree | 352798ff6073e18a467a9ffeab548485070dc568 /doc | |
parent | 8c341bbaca5e89a9620702bc0025641e815e4195 (diff) | |
download | s6-rc-f9940bb7d1a6ce7d7772e8cbdbbd55a321cc5c18.tar.xz |
Add -s to s6-rc-init; prepare for 0.3.0.0
Diffstat (limited to 'doc')
-rw-r--r-- | doc/index.html | 2 | ||||
-rw-r--r-- | doc/s6-rc-init.html | 11 | ||||
-rw-r--r-- | doc/upgrade.html | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/doc/index.html b/doc/index.html index 4f501ab..544fa85 100644 --- a/doc/index.html +++ b/doc/index.html @@ -66,7 +66,7 @@ scripts are also run in a controlled environment. <ul> <li> The current released version of s6-rc is -<a href="s6-rc-0.2.2.0.tar.gz">0.2.2.0</a>. </li> +<a href="s6-rc-0.3.0.0.tar.gz">0.3.0.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/">s6-rc git repository</a>: diff --git a/doc/s6-rc-init.html b/doc/s6-rc-init.html index f3a7bb1..c531ad6 100644 --- a/doc/s6-rc-init.html +++ b/doc/s6-rc-init.html @@ -28,7 +28,7 @@ invocation of the <h2> Interface </h2> <pre> - s6-rc-init [ -c <em>compiled</em> ] [ -l <em>live</em> ] [ -t <em>timeout</em> ] [ -b ] <em>scandir</em> + s6-rc-init [ -c <em>compiled</em> ] [ -l <em>live</em> ] [ -s <em>suffix</em> ] [ -t <em>timeout</em> ] [ -b ] <em>scandir</em> </pre> <ul> @@ -74,6 +74,15 @@ filesystem. Default is <tt>/run/s6-rc</tt>. The default can be changed at compile time by giving the <tt>--livedir=<em>live</em></tt> option to <tt>./configure</tt>. </li> + <li> <tt>-s <em>suffix</em></tt> : when linking all the +service directory into <em>scandir</em>, add <em>suffix</em> to the +names of the symbolic links. This allows several live directories +to be used with a unique scandir without risking conflicts between +longruns that would have the same name. This option is only useful +if you intend to have several sets of services independently managed +by s6-rc, with different live directories, all using the same scandir +to supervise their longruns. The default is no suffix at all, which +is best when you only have one live directory. </li> <li> <tt>-b</tt> : blocking lock. If the database is currently being used by another program, s6-rc-init will wait until that other program has released its lock on the database, then proceed. diff --git a/doc/upgrade.html b/doc/upgrade.html index fb0f3c8..d48cb98 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -30,7 +30,7 @@ minor and bugfix version changes. <h1> What has changed in s6-rc </h1> -<h2> in 0.2.2.0 </h2> +<h2> in 0.3.0.0 </h2> <ul> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> @@ -39,6 +39,8 @@ dependency bumped to 2.6.0.1. </li> dependency bumped to 2.3.0.3. </li> <li> <a href="//skarnet.org/software/s6/">s6</a> dependency bumped to 2.6.1.1. </li> + <li> New <tt>-s</tt> option to <a href="s6-rc-init.html">s6-rc-init</a> +to allow using several live directories with the same scandir. </li> </ul> <h2> in 0.2.1.2 </h2> |