diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 30 | ||||
| -rw-r--r-- | doc/install.html | 10 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/runsv.8.html | 14 | ||||
| -rw-r--r-- | doc/svwaitdown.8.html | 72 | ||||
| -rw-r--r-- | doc/svwaitup.8.html | 61 | ||||
| -rwxr-xr-x | package/upgrade | 4 |
9 files changed, 105 insertions, 98 deletions
diff --git a/Makefile b/Makefile index 18c9d06..8caf7c8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-0.9.1 +PACKAGE=runit-0.9.2 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 diff --git a/debian/changelog b/debian/changelog index 32d7dc5..380148a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +runit (0.9.2-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape <pape@smarden.org> Sat, 3 May 2003 17:58:14 +0200 + runit (0.9.1-1) unstable; urgency=low * new upstream version. diff --git a/debian/rules b/debian/rules index e0c68d2..3e83553 100755 --- a/debian/rules +++ b/debian/rules @@ -15,11 +15,11 @@ build-arch: configure-stamp build-arch-stamp build-arch-stamp: dh_testdir - tar xfzvp runit-0.9.1.tar.gz + tar xfzvp runit-0.9.2.tar.gz ( \ set -e; \ - cd admin/runit-0.9.1/src; \ - ln -s runit-0.9.1 runit; mv runit ../..; \ + cd admin/runit-0.9.2/src; \ + ln -s runit-0.9.2 runit; mv runit ../..; \ echo 'diet -v -Os gcc -O2 -Wall' >conf-cc; \ echo 'diet -v -Os gcc -s -Os -pipe' >conf-ld; \ $(MAKE); \ @@ -52,28 +52,28 @@ install: build dh_installdirs # runit - install -m0500 admin/runit-0.9.1/src/runit \ + install -m0500 admin/runit-0.9.2/src/runit \ $(CURDIR)/debian/runit/sbin/runit - install -m0500 admin/runit-0.9.1/src/runit-init \ + install -m0500 admin/runit-0.9.2/src/runit-init \ $(CURDIR)/debian/runit/sbin/runit-init - install -m0755 admin/runit-0.9.1/src/runsvdir \ + install -m0755 admin/runit-0.9.2/src/runsvdir \ $(CURDIR)/debian/runit/usr/bin/runsvdir - install -m0755 admin/runit-0.9.1/src/runsv \ + install -m0755 admin/runit-0.9.2/src/runsv \ $(CURDIR)/debian/runit/usr/bin/runsv - install -m0755 admin/runit-0.9.1/src/runsvchdir \ + install -m0755 admin/runit-0.9.2/src/runsvchdir \ $(CURDIR)/debian/runit/usr/sbin/runsvchdir - install -m0755 admin/runit-0.9.1/src/svlogd \ + install -m0755 admin/runit-0.9.2/src/svlogd \ $(CURDIR)/debian/runit/usr/bin/svlogd - install -m0755 admin/runit-0.9.1/src/svwaitdown \ + install -m0755 admin/runit-0.9.2/src/svwaitdown \ $(CURDIR)/debian/runit/usr/bin/svwaitdown - install -m0755 admin/runit-0.9.1/src/svwaitup \ + install -m0755 admin/runit-0.9.2/src/svwaitup \ $(CURDIR)/debian/runit/usr/bin/svwaitup - install -m0755 admin/runit-0.9.1/src/utmpset \ + install -m0755 admin/runit-0.9.2/src/utmpset \ $(CURDIR)/debian/runit/usr/sbin/utmpset - install -m0755 admin/runit-0.9.1/src/runsvstat \ + install -m0755 admin/runit-0.9.2/src/runsvstat \ $(CURDIR)/debian/runit/usr/bin/runsvstat - install -m0755 admin/runit-0.9.1/src/runsvctrl \ + install -m0755 admin/runit-0.9.2/src/runsvctrl \ $(CURDIR)/debian/runit/usr/bin/runsvctrl install -m0755 debian/getty-tty5.run \ @@ -117,7 +117,7 @@ binary-arch: build install # dh_installdocs -an # dh_installexamples -a dh_installman -a admin/runit/man/*.8 - dh_installchangelogs -a admin/runit-0.9.1/package/CHANGES + dh_installchangelogs -a admin/runit-0.9.2/package/CHANGES dh_strip -a # dh_link -a dh_compress -a diff --git a/doc/install.html b/doc/install.html index 08cf959..9c1e85f 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-0.9.1.tar.gz">runit-0.9.1.tar.gz</a> into <tt>/package</tt> +<a href="runit-0.9.2.tar.gz">runit-0.9.2.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-0.9.1.tar - # tar -xpf runit-0.9.1.tar - # rm runit-0.9.1.tar - # cd admin/runit-0.9.1 + # gunzip runit-0.9.2.tar + # tar -xpf runit-0.9.2.tar + # rm runit-0.9.2.tar + # cd admin/runit-0.9.2 </pre> Compile and install the <i>runit</i> programs <pre> diff --git a/doc/replaceinit.html b/doc/replaceinit.html index 4d2828a..491cfc8 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -107,7 +107,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.9.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.9.2@smarden.org </pre> <hr> @@ -188,7 +188,7 @@ Use <b>init 6</b> to reboot and <b>init 0</b> to halt a system that runs <p> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.9.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.9.2@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/runsv.8.html b/doc/runsv.8.html index 7c8f6d4..6f44c86 100644 --- a/doc/runsv.8.html +++ b/doc/runsv.8.html @@ -19,13 +19,13 @@ service switches to the directory <I>service</I> and starts ./run. if ./run exits and ./finish exists, <B>runsv</B> starts ./finish. If ./finish doesn't exist or ./finish exits, <B>runsv</B> restarts ./run. <P> -If ./run or ./finish exit immediatly, <B>runsv</B> waits a second -before starting ./finish or restarting ./run. <P> -If the file <I>service</I>/down exists, -<B>runsv</B> does not start ./run immediately. The control interface (see below) -can be used to start the service and to give other commands to <B>runsv</B>. <P> -If -the directory <I>service</I>/log exists, <B>runsv</B> creates a pipe, redirects <I>service</I>/run's +If ./run or ./finish exit immediately, <B>runsv</B> waits a +second before starting ./finish or restarting ./run. <P> +If the file <I>service</I>/down +exists, <B>runsv</B> does not start ./run immediately. The control interface (see +below) can be used to start the service and to give other commands to <B>runsv</B>. +<P> +If the directory <I>service</I>/log exists, <B>runsv</B> creates a pipe, redirects <I>service</I>/run's and <I>service</I>/finish's standard output to the pipe, switches to the directory <I>service</I>/log and starts ./run (and ./finish) exactly as described above for the <I>service</I> directory. The standard input of the log service a redirected diff --git a/doc/svwaitdown.8.html b/doc/svwaitdown.8.html index b988e60..c34af61 100644 --- a/doc/svwaitdown.8.html +++ b/doc/svwaitdown.8.html @@ -9,59 +9,59 @@ <a href="http://smarden.org/pape/">G. Pape</a><br><A HREF="index.html">runit</A><hr><P> <H2><A NAME="sect0">Name</A></H2> -svwaitdown - waits for services controlled by <I>supervise(8)</I> to be down - +svwaitdown - waits for services controlled by <I>runsv(8)</I> or <I>supervise(8)</I> +to be down <H2><A NAME="sect1">Synopsis</A></H2> <B>svwaitdown</B> [ <B>-v</B> ] [ <B>-k</B> ] [ <B>-t</B> <I>sec</I> ] <I>services</I> <H2><A NAME="sect2">Description</A></H2> -<I>services</I> consists -of one or more arguments. Each <I>service</I> directory must start with a slash. -<P> -<B>svwaitdown</B> sends each <I>service</I> given at the command line the ``down'' command, -and waits for it to become down. The <I>services</I> given at the command line -must be controlled by <B><I>supervise</B>(8)</I>. <P> -<B>svwaitdown</B> blocks, limited by a <I>timeout</I>, -until all <I>services</I> are down or reports errors. +<I>services</I> +consists of one or more arguments. Each <I>service</I> directory must start with +a slash. <P> +<B>svwaitdown</B> sends each <I>service</I> given at the command line the ``down'' +command, and waits for it to become down. The <I>services</I> given at the command +line must be controlled by <B><I>runsv</B>(8)</I>, or <B><I>supervise</B>(8)</I>. <P> +<B>svwaitdown</B> blocks, +limited by a <I>timeout</I>, until all <I>services</I> are down or reports errors. <H2><A NAME="sect3">Options</A></H2> <DL> -<DT><B>-v</B> </DT> -<DD>verbose. Print verbose -messages to stderr. </DD> +<DT><B>-v</B> +</DT> +<DD>verbose. Print verbose messages to stderr. </DD> <DT><B>-t <I>sec</B> </I></DT> -<DD>Set the timeout for waiting for <I>services</I> to become -down to <I>sec</I> seconds. <I>sec</I> must be between 2 and 6000. Default is 600 (10 minutes). -</DD> +<DD>Set the timeout for waiting +for <I>services</I> to become down to <I>sec</I> seconds. <I>sec</I> must be between 2 and 6000. +Default is 600 (10 minutes). </DD> <DT><B>-k</B> </DT> -<DD>Kill. If the timeout is reached before all <I>services</I> are down, tell the -<B><I>supervise</B>(8)</I> processes to send the <I>services</I> a KILL signal. </DD> +<DD>Kill. If the timeout is reached before all +<I>services</I> are down, tell the <B><I>runsv</B>(8)</I> processes to send the <I>services</I> a KILL +signal. </DD> <DT><B>-x</B> </DT> -<DD>Exit. Send each -<I>service</I> the ``exit'' command additionally to the ``down'' command, and wait for -the corresponding <B><I>runsv</B>(8)</I> processes to exit instead for the <I>services</I> to -be down. This option should only be used by <B><I>runit</B>(8)</I> in stage 3 when <B><I>runsvdir</B>(8)</I> -is already stopped. <P> - </DD> +<DD>Exit. Send each <I>service</I> the ``exit'' command additionally to the ``down'' +command, and wait for the corresponding <B><I>runsv</B>(8)</I> processes to exit instead +for the <I>services</I> to be down. This option should only be used by <B><I>runit</B>(8)</I> +in stage 3 when <B><I>runsvdir</B>(8)</I> is already stopped. </DD> </DL> <H2><A NAME="sect4">Exit Codes</A></H2> -<B>svwaitdown</B> returns 0 as soon as all <I>services</I> -are down. <P> -If a <I>service</I> is usually controlled by <B><I>supervise</B>(8)</I>, but no <B><I>supervise</B>(8)</I> -process is currently running, <B>svwaitdown</B> treats this <I>service</I> as if it would -be down. <P> -For each <I>service</I> that causes an error while checking, <B>svwaitdown</B> -increases the exit code by one and exits non zero. The maximum is 100. <P> -<B>svwaitdown</B> -returns 111 if the timeout <I>sec</I> was reached. +<B>svwaitdown</B> returns +0 as soon as all <I>services</I> are down. <P> +If a <I>service</I> is usually controlled by +<B><I>runsv (8)</B></I> or <B><I>supervise</B>(8)</I>, but no supervisor process is currently running, +<B>svwaitdown</B> treats this <I>service</I> as if it would be down. <P> +For each <I>service</I> +that causes an error while checking, <B>svwaitdown</B> increases the exit code +by one and exits non zero. The maximum is 100. <P> +<B>svwaitdown</B> returns 111 if +the timeout <I>sec</I> was reached. <H2><A NAME="sect5">See Also</A></H2> -<I>svwaitdown(8)</I>, <I>runsv(8)</I>, -<I>runsvctrl(8)</I>, <I>runsvstat(8)</I>, <I>runsvdir(8)</I>, <I>runsvchdir(8)</I>, <I>runit(8)</I>, <I>runit-init(8)</I>, -<I>supervise(8)</I>, <I>svscan(8)</I> <P> +<I>svwaitdown(8)</I>, <I>runsv(8)</I>, <I>runsvctrl(8)</I>, +<I>runsvstat(8)</I>, <I>runsvdir(8)</I>, <I>runsvchdir(8)</I>, <I>runit(8)</I>, <I>runit-init(8)</I>, <I>supervise(8)</I>, +<I>svscan(8)</I> <P> <I>http://smarden.org/runit/</I><BR> <I>http://cr.yp.to/daemontools.html</I><BR> diff --git a/doc/svwaitup.8.html b/doc/svwaitup.8.html index 673ea1a..77b652e 100644 --- a/doc/svwaitup.8.html +++ b/doc/svwaitup.8.html @@ -9,49 +9,50 @@ <a href="http://smarden.org/pape/">G. Pape</a><br><A HREF="index.html">runit</A><hr><P> <H2><A NAME="sect0">Name</A></H2> -svwaitup - waits for services controlled by <I>supervise(8)</I> to be up +svwaitup - waits for services controlled by <I>runsv(8)</I> or <I>supervise(8)</I> +to be up <H2><A NAME="sect1">Synopsis</A></H2> -<B>svwaitup</B> -[ <B>-v</B> ] [ <B>-s</B> <I>sec</I> ] <I>services</I> +<B>svwaitup</B> [ <B>-v</B> ] [ <B>-s</B> <I>sec</I> ] <I>services</I> <H2><A NAME="sect2">Description</A></H2> -<I>services</I> consist of one or more arguments. -Each <I>service</I> directory must start with a slash. <P> -<B>svwaitup</B> checks each <I>service</I> -given at the command line for being at least the specified number of seconds -<I>sec</I> up. The <I>services</I> given at the command line must be controlled by <B><I>supervise</B>(8)</I>. -<P> -<B>svwaitup</B> blocks until all <I>services</I> were up and running at least <I>sec</I> seconds -when <B>svwaitup</B> was checking or reports errors. +<I>services</I> +consist of one or more arguments. Each <I>service</I> directory must start with +a slash. <P> +<B>svwaitup</B> checks each <I>service</I> given at the command line for being +at least the specified number of seconds <I>sec</I> up. The <I>services</I> given at the +command line must be controlled by <B><I>runsv</B>(8)</I>, or <B><I>supervise</B>(8)</I>. <P> +<B>svwaitup</B> blocks +until all <I>services</I> were up and running at least <I>sec</I> seconds when <B>svwaitup</B> +was checking or reports errors. <H2><A NAME="sect3">Options</A></H2> <DL> <DT><B>-v</B> </DT> -<DD>verbose. Print verbose -messages to stderr. </DD> +<DD>verbose. Print verbose messages +to stderr. </DD> <DT><B>-s <I>sec</B> </I></DT> -<DD>Set the minimum number of seconds each <I>service</I> -has to be up to <I>sec</I> seconds. <I>sec</I> must be between 2 and 600. Default is 2. -</DD> +<DD>Set the minimum number of seconds each <I>service</I> has to be +up to <I>sec</I> seconds. <I>sec</I> must be between 2 and 600. Default is 2. </DD> </DL> <H2><A NAME="sect4">Exit Codes</A></H2> -<B>svwaitup</B> returns 0 as soon as all <I>services</I> were at least <I>sec</I> -seconds up. <P> -<B>Note</B>: If <B>svwaitup</B> exits 0, it does not guarantee that all <I>services</I> -are actually running. A <I>service</I> could have crashed immediatly after <B>svwaitup</B> -was successfully checking it to be up <I>sec</I> seconds. <I>services</I> should be designed -not to rely on <B>svwaitup</B> to resolve dependencies. <P> -For each <I>service</I> that is -down and not requested to become up, or that causes an error while checking -(e.g. <B><I>supervise</B>(8)</I> is not running), <B>svwaitup</B> increases the exit code by one -and exits non zero. The maximum is 100. <P> +<B>svwaitup</B> +returns 0 as soon as all <I>services</I> were at least <I>sec</I> seconds up. <P> +<B>Note</B>: If +<B>svwaitup</B> exits 0, it does not guarantee that all <I>services</I> are actually +running. A <I>service</I> could have crashed immediatly after <B>svwaitup</B> was successfully +checking it to be up <I>sec</I> seconds. <I>services</I> should be designed not to rely +on <B>svwaitup</B> to resolve dependencies. <P> +For each <I>service</I> that is down and not +requested to become up, or that causes an error while checking (e.g. <B><I>runsv</B>(8)</I> +is not running), <B>svwaitup</B> increases the exit code by one and exits non +zero. The maximum is 100. <P> <B>svwaitup</B> returns 111 on error. -<H2><A NAME="sect5">See -Also</A></H2> -<I>svwaitdown(8)</I>, <I>runsv(8)</I>, <I>runsvctrl(8)</I>, <I>runsvstat(8)</I>, <I>runsvdir(8)</I>, <I>runsvchdir(8)</I>, -<I>runit(8)</I>, <I>runit-init(8)</I>, <I>supervise(8)</I>, <I>svscan(8)</I> <P> +<H2><A NAME="sect5">See Also</A></H2> +<I>svwaitdown(8)</I>, +<I>runsv(8)</I>, <I>runsvctrl(8)</I>, <I>runsvstat(8)</I>, <I>runsvdir(8)</I>, <I>runsvchdir(8)</I>, <I>runit(8)</I>, +<I>runit-init(8)</I>, <I>supervise(8)</I>, <I>svscan(8)</I> <P> <I>http://smarden.org/runit/</I><BR> <I>http://cr.yp.to/daemontools.html</I><BR> diff --git a/package/upgrade b/package/upgrade index d814d5e..e15af6c 100755 --- a/package/upgrade +++ b/package/upgrade @@ -7,9 +7,9 @@ test -d src || ( echo 'Wrong working directory.'; exit 1 ) here=`env - PATH=$PATH pwd` parent=`dirname $here` -echo 'Creating symlink runit -> runit-0.9.1...' +echo 'Creating symlink runit -> runit-0.9.2...' rm -f runit -ln -s runit-0.9.1 runit +ln -s runit-0.9.2 runit mv -f runit .. echo 'Making command links in /command...' |