diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | doc/runsv.8.html | 75 | ||||
| -rw-r--r-- | doc/runsvctrl.8.html | 13 | ||||
| -rwxr-xr-x | package/upgrade | 4 |
4 files changed, 49 insertions, 52 deletions
diff --git a/Makefile b/Makefile index 4573116..a574c34 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-1.2.3 +PACKAGE=runit-1.2.6 DIRS=doc man etc package src MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 svwaitdown.8 svwaitup.8 \ utmpset.8 runsvchdir.8 runsvstat.8 runsvctrl.8 svlogd.8 chpst.8 @@ -33,9 +33,10 @@ $(PACKAGE).tar.gz: chmod -R g-ws TEMP/admin chmod +t TEMP/admin find TEMP -exec touch {} \; - su -c 'chown -R root:root TEMP/admin ; \ - ( cd TEMP ; tar cpfz ../$(PACKAGE).tar.gz admin --exclude CVS ) ; \ - rm -rf TEMP' + su -c '\ + chown -R root:root TEMP/admin ; \ + (cd TEMP && tar --exclude CVS -cpzf ../$(PACKAGE).tar.gz admin); \ + rm -rf TEMP' clean: find . -name \*~ -exec rm -f {} \; diff --git a/doc/runsv.8.html b/doc/runsv.8.html index 986854c..b87dd9d 100644 --- a/doc/runsv.8.html +++ b/doc/runsv.8.html @@ -75,37 +75,33 @@ service is running, send it a ALRM signal. </dd> running, send it a INT signal. </dd> <dt><b>q</b> </dt> -<dd>Quit. If the service is running, send it a QUIT signal. </dd> +<dd>Quit. If the service is running, send it +a QUIT signal. </li><b></b><li>User-defined 1. If the service is running, send it a USR1 signal. +</li><b></b><li>User-defined 2. If the service is running, send it a USR2 signal. </dd> -<dt><b>1</b> </dt> -<dd>User-defined 1. If the service is running, send it a USR1 signal. </dd> - -<dt><b>2</b> </dt> -<dd>User-defined 2. If the service is running, send it a USR2 signal. </dd> - -<dt><b>t</b> -</dt> -<dd>Terminate. If the service is running, send it a TERM signal. </dd> +<dt><b>t</b> </dt> +<dd>Terminate. +If the service is running, send it a TERM signal. </dd> <dt><b>k</b> </dt> -<dd>Kill. If the -service is running, send it a KILL signal. </dd> - -<dt><b>x or <b>e</b> </b></dt> -<dd>Exit. If the service is -running, send it a TERM signal, and then a CONT signal. Do not restart the -service. If the service is down, and no log service exists, <b>runsv</b> exits. -If the service is down and a log service exists, <b>runsv</b> closes the standard -input of the log service, and waits for it to terminate. If the log service -is down, <b>runsv</b> exits. This command is ignored if it is given to <i>service</i>/log/supervise/control. +<dd>Kill. If the service +is running, send it a KILL signal. </dd> + +<dt><b>x</b> </dt> +<dd>Exit. If the service is running, send +it a TERM signal, and then a CONT signal. Do not restart the service. If +the service is down, and no log service exists, <b>runsv</b> exits. If the service +is down and a log service exists, <b>runsv</b> closes the standard input of the +log service, and waits for it to terminate. If the log service is down, +<b>runsv</b> exits. This command is ignored if it is given to <i>service</i>/log/supervise/control. </dd> </dl> <p> -Example: to send a TERM signal to the socklog-unix service, either do<br> - # runsvctrl term /var/service/socklog-unix<br> - or<br> - # echo -n t >/var/service/socklog-unix/supervise/control<br> -<p> +Example: to send a TERM signal to the socklog-unix service, either do +# runsvctrl term /var/service/socklog-unix<br> + or<br> + # echo -n t >/var/service/socklog-unix/supervise/control<br> + <p> If <i><b>echo</b>(1)</i> on your systems does not provide the -n option, leave it out, <b>runsv</b> ignores unknown characters written to the control pipe. <i><b>echo</b>(1)</i> usually blocks if no <b>runsv</b> process is running in the service directory. @@ -115,23 +111,26 @@ For each control character <i>c</i> sent to the control pipe, <b>runsv</b> first checks if <i>service/control/<i>c</i> exists and is executable. If so, it starts <i>service</i>/control/<i>c</i> and waits for it to terminate, before interpreting the command. If the program exits with return code 0, <b>runsv</b> refrains from sending the service the corresponding -signal. The command <i>o</i> is always considered as command <i>u</i>. The control of the -optional log service cannot be customized. -<h2><a name='sect5'></i>Signals</a></h2> -If <b>runsv</b> receives a TERM -signal, it acts as if the character x was written to the control pipe. -<h2><a name='sect6'>Exit -Codes</a></h2> -<b>runsv</b> exits 111 on an error on startup or if another <b>runsv</b> is running -in <i>service</i>. <p> +signal. The command <i>o</i> is always considered as command <i>u</i>. On command <i>d</i> first +<i>service</i>/control/t</i> is checked, and then <i>service/control/d.</i> On command <i>x</i> first +<i>service/control/t</i> is checked, and then <i>service/control/x.</i> The control of +the optional log service cannot be customized. +<h2><a name='sect5'>Signals</a></h2> +If <b>runsv</b> receives +a TERM signal, it acts as if the character x was written to the control +pipe. +<h2><a name='sect6'>Exit Codes</a></h2> +<b>runsv</b> exits 111 on an error on startup or if another <b>runsv</b> +is running in <i>service</i>. <p> <b>runsv</b> exits 0 if it was told to exit. <h2><a name='sect7'>See Also</a></h2> -<i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, -<i>chpst(8)</i>, <i>svlogd(8)</i>, <i>runit(8)</i>, <i>runit-init(8)</i>, <i>runsvdir(8)</i>, <i>runsvchdir(8)</i>, -<i>utmpset(8)</i> <p> +<i>runsvctrl(8)</i>, +<i>runsvstat(8)</i>, <i>chpst(8)</i>, <i>svlogd(8)</i>, <i>runit(8)</i>, <i>runit-init(8)</i>, <i>runsvdir(8)</i>, +<i>runsvchdir(8)</i>, <i>utmpset(8)</i> <p> <i>http://smarden.org/runit/</i> <h2><a name='sect8'>Author</a></h2> -Gerrit Pape <pape@smarden.org> <p> +Gerrit Pape <pape@smarden.org> +<p> <hr><p> <a name='toc'><b>Table of Contents</b></a><p> diff --git a/doc/runsvctrl.8.html b/doc/runsvctrl.8.html index be9e68f..a08d6ee 100644 --- a/doc/runsvctrl.8.html +++ b/doc/runsvctrl.8.html @@ -57,16 +57,13 @@ is running, send it a ALRM signal. </dd> send it a INT signal. </dd> <dt><b>quit</b> </dt> -<dd>If the service is running, send it a QUIT signal. </dd> - -<dt><b>1</b> </dt> -<dd>If the service is running, send it a USR1 signal. </dd> - -<dt><b>2</b> </dt> -<dd>If the service is running, send it a USR2 signal. </dd> +<dd>If the service is running, send it a QUIT signal. +</li><b></b><li>If the service is running, send it a USR1 signal. </li><b></b><li>If the service is running, +send it a USR2 signal. </dd> <dt><b>term</b> </dt> -<dd>If the service is running, send it a TERM signal. </dd> +<dd>If the service is running, send it a TERM signal. +</dd> <dt><b>kill</b> </dt> <dd>If the service is running, send it a KILL signal. </dd> diff --git a/package/upgrade b/package/upgrade index 51b99aa..cc9b832 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.2.3...' +echo 'Creating symlink runit -> runit-1.2.6...' rm -f runit -ln -s runit-1.2.3 runit +ln -s runit-1.2.6 runit mv -f runit .. echo 'Making command links in /command...' |