diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/install.html | 12 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/runsvchdir.8.html | 8 | ||||
| -rw-r--r-- | doc/sv.8.html | 117 | ||||
| -rwxr-xr-x | package/upgrade | 4 | ||||
| -rw-r--r-- | package/versions | 1 |
7 files changed, 75 insertions, 73 deletions
diff --git a/Makefile b/Makefile index f125cda..5d4395b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-1.8.0 +PACKAGE=runit-1.9.0 DIRS=doc man etc package src MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 sv.8 utmpset.8 \ runsvchdir.8 svlogd.8 chpst.8 diff --git a/doc/install.html b/doc/install.html index eb19e43..1c8e505 100644 --- a/doc/install.html +++ b/doc/install.html @@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now: # chmod 1755 /package </pre> Download -<a href="runit-1.8.0.tar.gz">runit-1.8.0.tar.gz</a> into <tt>/package</tt> +<a href="runit-1.9.0.tar.gz">runit-1.9.0.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-1.8.0.tar - # tar -xpf runit-1.8.0.tar - # rm runit-1.8.0.tar - # cd admin/runit-1.8.0 + # gunzip runit-1.9.0.tar + # tar -xpf runit-1.9.0.tar + # rm runit-1.9.0.tar + # cd admin/runit-1.9.0 </pre> On MacOSX, do <pre> @@ -43,7 +43,7 @@ hierarchy, do: </pre> To report success: <pre> - # mail pape-runit-1.8.0@smarden.org <compile/sysdeps + # mail pape-runit-1.9.0@smarden.org <compile/sysdeps </pre> If you use <i>runit</i> regularly, please <a href="http://smarden.org/pape/#contribution">contribute</a> to the project. diff --git a/doc/replaceinit.html b/doc/replaceinit.html index 010d064..aad85ff 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -122,7 +122,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.8.0@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.9.0@smarden.org </pre> <hr> @@ -211,7 +211,7 @@ This will cause <i>runit</i> to enter stage 3 which runs <p> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.8.0@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.9.0@smarden.org </pre> <h3>Step 5: Service migration</h3> The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the diff --git a/doc/runsvchdir.8.html b/doc/runsvchdir.8.html index ea3e585..54e66a5 100644 --- a/doc/runsvchdir.8.html +++ b/doc/runsvchdir.8.html @@ -20,11 +20,11 @@ If <i>dir</i> does not start with a slash, it is searched in /etc/runit/runsvdir <b>runsvchdir</b> switches to the directory <i>/etc/runit/runsvdir/</i>, copies <i>current</i> to <i>previous</i>, and replaces <i>current</i> with a symlink pointing to <i>dir</i>. <p> -Normally <i>/service</i> is a symlink to <i>current</i>, and <i><b>runsvdir</b>(8)</i> -is running <i>/service/</i>. +Normally <i>/service</i> is a symlink to <i>current</i>, and <i><b>runsvdir</b>(8)</i> is running +<i>/service/</i>. <h2><a name='sect3'>Exit Codes</a></h2> -<b>runsvchdir</b> prints an error message and -exits 111 on error. <b>runsvchdir</b> exits 0 on success. +<b>runsvchdir</b> prints an error message and exits 111 on +error. <b>runsvchdir</b> exits 0 on success. <h2><a name='sect4'>Files</a></h2> /etc/runit/runsvdir/previous<br> /etc/runit/runsvdir/current<br> diff --git a/doc/sv.8.html b/doc/sv.8.html index 1fb4d84..f8c6b26 100644 --- a/doc/sv.8.html +++ b/doc/sv.8.html @@ -20,88 +20,89 @@ The monitored by the <i><b>runsv</b>(8)</i> supervisor. <p> <i>services</i> consists of one or more arguments, each argument naming a directory <i>service</i> used by <i><b>runsv</b>(8)</i>. If <i>service</i> doesn’t -start with a dot or slash, it is searched in the default services directory -<i>/service/</i>, otherwise relative to the current directory. <p> -<i>command</i> is one -of up, down, status, once, pause, cont, hup, alarm, interrupt, 1, 2, term, -kill, or exit, or start, stop, restart, shutdown, force-stop, force-reload, -force-restart, force-shutdown. <p> -The <b>sv</b> program can be sym-linked to <i>/etc/init.d/</i> -to provide an LSB init script interface. The <i>service</i> to be controlled then -is specified by the base name of the ‘‘init script’’. +start with a dot or slash and doesn’t end with a slash, it is searched in +the default services directory <i>/service/</i>, otherwise relative to the current +directory. <p> +<i>command</i> is one of up, down, status, once, pause, cont, hup, alarm, +interrupt, 1, 2, term, kill, or exit, or start, stop, restart, shutdown, +force-stop, force-reload, force-restart, force-shutdown. <p> +The <b>sv</b> program can +be sym-linked to <i>/etc/init.d/</i> to provide an LSB init script interface. The +<i>service</i> to be controlled then is specified by the base name of the ‘‘init +script’’. <h2><a name='sect3'>Commands</a></h2> <dl> <dt><b>status</b> </dt> -<dd>Report -the current status of the service, and the appendant log service if available, -to standard output. </dd> +<dd>Report the current status of the service, and the +appendant log service if available, to standard output. </dd> <dt><b>up</b> </dt> -<dd>If the service is not running, start it. If the service -stops, restart it. </dd> +<dd>If the service +is not running, start it. If the service stops, restart it. </dd> <dt><b>down</b> </dt> -<dd>If the service is running, send it the TERM signal, -and the CONT signal. If ./run exits, start ./finish if it exists. After it -stops, do not restart service. </dd> +<dd>If the service +is running, send it the TERM signal, and the CONT signal. If ./run exits, +start ./finish if it exists. After it stops, do not restart service. </dd> -<dt><b>once</b> </dt> -<dd>If the service is not running, start -it. Do not restart it if it stops. </dd> +<dt><b>once</b> +</dt> +<dd>If the service is not running, start it. Do not restart it if it stops. </dd> -<dt><b>pause cont hup alarm interrupt quit 1 -2 term kill</b> </dt> -<dd>If the service is running, send it the STOP, CONT, HUP, ALRM, -INT, QUIT, USR1, USR2, TERM, or KILL signal respectively. </dd> +<dt><b>pause +cont hup alarm interrupt quit 1 2 term kill</b> </dt> +<dd>If the service is running, +send it the STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, or KILL +signal respectively. </dd> <dt><b>exit</b> </dt> -<dd>If the service -is running, send it the TERM signal, and the CONT signal. Do not restart -the service. If the service is down, and no log service exists, <i><b>runsv</b>(8)</i> -exits. If the service is down and a log service exists, send the TERM signal -to the log service. If the log service is down, <i><b>runsv</b>(8)</i> exits. This command -is ignored if it is given to an appendant log service. </dd> +<dd>If the service is running, send it the TERM signal, +and the CONT signal. Do not restart the service. If the service is down, +and no log service exists, <i><b>runsv</b>(8)</i> exits. If the service is down and a +log service exists, send the TERM signal to the log service. If the log +service is down, <i><b>runsv</b>(8)</i> exits. This command is ignored if it is given +to an appendant log service. </dd> </dl> <p> -<b>sv</b> actually looks -only at the first character of these <i>command</i>s. -<h3><a name='sect4'>Commands compatible to LSB -init script actions</a></h3> +<b>sv</b> actually looks only at the first character +of these <i>command</i>s. +<h3><a name='sect4'>Commands compatible to LSB init script actions</a></h3> <dl> -<dt><b>status</b> </dt> +<dt><b>status</b> +</dt> <dd>Same as <i>status</i>. </dd> <dt><b>start</b> </dt> -<dd>Same as <i>up</i>, but wait up -to 7 seconds for the command to take effect. Then report the status or timeout. -If the script <i>./check</i> exists in the service directory, <b>sv</b> runs this script -to check whether the service is up and available; it’s considered to be -available if <i>./check</i> exits with 0. </dd> +<dd>Same as <i>up</i>, but wait up to 7 seconds for the command +to take effect. Then report the status or timeout. If the script <i>./check</i> exists +in the service directory, <b>sv</b> runs this script to check whether the service +is up and available; it’s considered to be available if <i>./check</i> exits with +0. </dd> <dt><b>stop</b> </dt> -<dd>Same as <i>down</i>, but wait up to 7 seconds -for the service to become down. Then report the status or timeout. </dd> +<dd>Same as <i>down</i>, but wait up to 7 seconds for the service to become +down. Then report the status or timeout. </dd> -<dt><b>restart</b> -</dt> -<dd>Send the commands <i>term</i>, <i>cont</i>, and <i>up</i> to the service, and wait up to 7 seconds -for the service to restart. Then report the status or timeout. If the script -<i>./check</i> exists in the service directory, <b>sv</b> runs this script to check whether -the service is up and available again; it’s considered to be available if -<i>./check</i> exits with 0. </dd> +<dt><b>restart</b> </dt> +<dd>Send the commands <i>term</i>, +<i>cont</i>, and <i>up</i> to the service, and wait up to 7 seconds for the service to +restart. Then report the status or timeout. If the script <i>./check</i> exists in +the service directory, <b>sv</b> runs this script to check whether the service +is up and available again; it’s considered to be available if <i>./check</i> exits +with 0. </dd> <dt><b>shutdown</b> </dt> -<dd>Same as <i>exit</i>, but wait up to 7 seconds for -the <i><b>runsv</b>(8)</i> process to terminate. Then report the status or timeout. </dd> +<dd>Same as <i>exit</i>, but wait up to 7 seconds for the <i><b>runsv</b>(8)</i> +process to terminate. Then report the status or timeout. </dd> -<dt><b>force-stop</b> -</dt> -<dd>Same as <i>down</i>, but wait up to 7 seconds for the service to become down. Then -report the status, and on timeout send the service the <i>kill</i> command. </dd> +<dt><b>force-stop</b> </dt> +<dd>Same as +<i>down</i>, but wait up to 7 seconds for the service to become down. Then report +the status, and on timeout send the service the <i>kill</i> command. </dd> <dt><b>force-reload</b> </dt> @@ -160,9 +161,9 @@ implies <i>-v</i>. </dd> default services directory <i>/service/</i>. </dd> <dt><b>SVWAIT</b> </dt> -<dd>The environment variable -$SVWAIT overrides the default 7 seconds to wait for a command to take effect. -It is overridden by the -w option. </dd> +<dd>The environment variable $SVWAIT +overrides the default 7 seconds to wait for a command to take effect. It +is overridden by the -w option. </dd> </dl> <h2><a name='sect8'>Exit Codes</a></h2> diff --git a/package/upgrade b/package/upgrade index 47421cb..a1b048e 100755 --- a/package/upgrade +++ b/package/upgrade @@ -8,9 +8,9 @@ test -d src || sh -cx '! : Wrong working directory.' here=`env - PATH=$PATH pwd` parent=`dirname $here` -echo 'Creating symlink runit -> runit-1.8.0...' +echo 'Creating symlink runit -> runit-1.9.0...' rm -f runit -ln -s runit-1.8.0 runit +ln -s runit-1.9.0 runit mv -f runit .. echo 'Making command links in /command...' diff --git a/package/versions b/package/versions index 53e14a8..63f1208 100644 --- a/package/versions +++ b/package/versions @@ -47,3 +47,4 @@ 1.7.1 1.7.2 1.8.0 +1.9.0 |