diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 38 | ||||
| -rw-r--r-- | doc/install.html | 12 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/runsv.8.html | 70 | ||||
| -rw-r--r-- | doc/runsvchdir.8.html | 8 | ||||
| -rw-r--r-- | doc/runsvdir.8.html | 8 | ||||
| -rw-r--r-- | doc/upgrade.html | 5 | ||||
| -rw-r--r-- | package/CHANGES | 2 | ||||
| -rwxr-xr-x | package/upgrade | 4 | ||||
| -rw-r--r-- | package/versions | 1 |
12 files changed, 85 insertions, 75 deletions
diff --git a/Makefile b/Makefile index c1c5628..60d93b0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-0.11.4 +PACKAGE=runit-0.12.0 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 diff --git a/debian/changelog b/debian/changelog index 1a529cf..98e815c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +runit (0.12.0-1) unstable; urgency=low + + * new upstream version. + + -- Gerrit Pape <pape@smarden.org> Wed, 29 Oct 2003 12:39:35 +0000 + runit (0.11.2-1) unstable; urgency=low * new upstream version. diff --git a/debian/rules b/debian/rules index 5d7e489..e8aea4b 100755 --- a/debian/rules +++ b/debian/rules @@ -41,16 +41,16 @@ build-arch: configure-stamp build-arch-stamp build-arch-stamp: dh_testdir - tar xfzvp runit-0.11.2.tar.gz + tar xfzvp runit-0.12.0.tar.gz # for i in debian/diff/*.diff; do \ -# cat $$i | ( cd admin/runit-0.11.2 && patch -p0 ); \ +# cat $$i | ( cd admin/runit-0.12.0 && patch -p0 ); \ # done -gcc -v ( \ set -e; \ - cd admin/runit-0.11.2/src; \ - ln -s runit-0.11.2 runit; mv runit ../..; \ + cd admin/runit-0.12.0/src; \ + ln -s runit-0.12.0 runit; mv runit ../..; \ echo "$(CC) $(CFLAGS)" >conf-cc; \ echo "$(CC) $(LDFLAGS)" >conf-ld; \ $(MAKE); \ @@ -82,29 +82,29 @@ install: build dh_installdirs # runit - install -m0500 admin/runit-0.11.2/src/runit \ + install -m0500 admin/runit-0.12.0/src/runit \ $(CURDIR)/debian/runit/sbin/runit - install -m0500 admin/runit-0.11.2/src/runit-init \ + install -m0500 admin/runit-0.12.0/src/runit-init \ $(CURDIR)/debian/runit/sbin/runit-init - install -m0755 admin/runit-0.11.2/src/runsvdir \ + install -m0755 admin/runit-0.12.0/src/runsvdir \ $(CURDIR)/debian/runit/usr/bin/runsvdir - install -m0755 admin/runit-0.11.2/src/runsv \ + install -m0755 admin/runit-0.12.0/src/runsv \ $(CURDIR)/debian/runit/usr/bin/runsv - install -m0755 admin/runit-0.11.2/src/runsvchdir \ + install -m0755 admin/runit-0.12.0/src/runsvchdir \ $(CURDIR)/debian/runit/usr/sbin/runsvchdir - install -m0755 admin/runit-0.11.2/src/svlogd \ + install -m0755 admin/runit-0.12.0/src/svlogd \ $(CURDIR)/debian/runit/usr/bin/svlogd - install -m0755 admin/runit-0.11.2/src/svwaitdown \ + install -m0755 admin/runit-0.12.0/src/svwaitdown \ $(CURDIR)/debian/runit/usr/bin/svwaitdown - install -m0755 admin/runit-0.11.2/src/svwaitup \ + install -m0755 admin/runit-0.12.0/src/svwaitup \ $(CURDIR)/debian/runit/usr/bin/svwaitup - install -m0755 admin/runit-0.11.2/src/utmpset \ + install -m0755 admin/runit-0.12.0/src/utmpset \ $(CURDIR)/debian/runit/usr/sbin/utmpset - install -m0755 admin/runit-0.11.2/src/runsvstat \ + install -m0755 admin/runit-0.12.0/src/runsvstat \ $(CURDIR)/debian/runit/usr/bin/runsvstat - install -m0755 admin/runit-0.11.2/src/runsvctrl \ + install -m0755 admin/runit-0.12.0/src/runsvctrl \ $(CURDIR)/debian/runit/usr/bin/runsvctrl - install -m0755 admin/runit-0.11.2/src/chpst \ + install -m0755 admin/runit-0.12.0/src/chpst \ $(CURDIR)/debian/runit/usr/bin/chpst # runsvdir-start to be used from /etc/inittab @@ -114,9 +114,9 @@ install: build # temporary? ( cd $(CURDIR)/debian/runit/usr/sbin/ && ln -s ../bin/chpst setuidgid ) - install -m0755 admin/runit-0.11.2/etc/debian/getty-tty5/run \ + install -m0755 admin/runit-0.12.0/etc/debian/getty-tty5/run \ $(CURDIR)/debian/runit/etc/runit/getty-5/run - install -m0755 admin/runit-0.11.2/etc/debian/getty-tty5/finish \ + install -m0755 admin/runit-0.12.0/etc/debian/getty-tty5/finish \ $(CURDIR)/debian/runit/etc/runit/getty-5/finish # lintian overrides @@ -155,7 +155,7 @@ binary-arch: build install # dh_installdocs -an # dh_installexamples -a dh_installman -a admin/runit/man/*.8 - dh_installchangelogs -a admin/runit-0.11.2/package/CHANGES + dh_installchangelogs -a admin/runit-0.12.0/package/CHANGES dh_strip -a dh_link -a dh_compress -a diff --git a/doc/install.html b/doc/install.html index 62b775a..ac2419d 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.11.4.tar.gz">runit-0.11.4.tar.gz</a> into <tt>/package</tt> +<a href="runit-0.12.0.tar.gz">runit-0.12.0.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-0.11.4.tar - # tar -xpf runit-0.11.4.tar - # rm runit-0.11.4.tar - # cd admin/runit-0.11.4 + # gunzip runit-0.12.0.tar + # tar -xpf runit-0.12.0.tar + # rm runit-0.12.0.tar + # cd admin/runit-0.12.0 </pre> On MacOSX, do <pre> @@ -43,7 +43,7 @@ hierarchy, do: </pre> To report success: <pre> - # mail pape-runit-0.11.4@smarden.org <compile/sysdeps + # mail pape-runit-0.12.0@smarden.org <compile/sysdeps </pre> Refer to <a href="replaceinit.html">replacing init</a> for replacing <i>init</i> with <i>runit</i>, or to diff --git a/doc/replaceinit.html b/doc/replaceinit.html index 87dd375..f0de9a5 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -114,7 +114,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.11.4@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.12.0@smarden.org </pre> <hr> @@ -200,7 +200,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.11.4@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.12.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/runsv.8.html b/doc/runsv.8.html index 0c540e5..046f49b 100644 --- a/doc/runsv.8.html +++ b/doc/runsv.8.html @@ -37,41 +37,41 @@ and in a human-readable format in <i>service</i>/supervise/stat, <i>service</i>/ <h2><a name='sect3'>Control</a></h2> The named pipes <i>service</i>/supervise/control, and (optionally) <i>service</i>/log/supervise/control -are provided to give commands to <b>runsv</b>. You can use <i><b>svc</b>(8)</i> to control the -service or just write one of the following characters to the named pipe: - +are provided to give commands to <b>runsv</b>. You can use <i><b>runsvctrl</b>(8)</i> to control +the service or just write one of the following characters to the named +pipe: <dl> <dt><b>u</b> </dt> -<dd>Up. If the service is not running, start it. If the service stops, restart -it. </dd> +<dd>Up. If the service is not running, start it. If the service stops, +restart it. </dd> <dt><b>d</b> </dt> -<dd>Down. If the service is running, send it a TERM signal. If ./run exits, -start ./finish if it exists. After it stops, do not restart service. </dd> +<dd>Down. If the service is running, send it a TERM signal. If ./run +exits, start ./finish if it exists. After it stops, do not restart service. +</dd> <dt><b>o</b> </dt> -<dd>Once. -If the service is not running, start it. Do not restart it if it stops. </dd> +<dd>Once. If the service is not running, start it. Do not restart it if it +stops. </dd> -<dt><b>p</b> -</dt> +<dt><b>p</b> </dt> <dd>Pause. If the service is running, send it a STOP signal. </dd> <dt><b>c</b> </dt> -<dd>Continue. If the -service is running, send it a CONT signal. </dd> +<dd>Continue. +If the service is running, send it a CONT signal. </dd> <dt><b>h</b> </dt> -<dd>Hangup. If the service is running, -send it a HUP signal. </dd> +<dd>Hangup. If the service +is running, send it a HUP signal. </dd> <dt><b>a</b> </dt> -<dd>Alarm. If the service is running, send it a ALRM -signal. </dd> +<dd>Alarm. If the service is running, send +it a ALRM signal. </dd> <dt><b>i</b> </dt> -<dd>Interrupt. If the service is running, send it a INT signal. +<dd>Interrupt. If the service is running, send it a INT signal. </dd> <dt><b>1</b> </dt> <dd>User-defined 1. If the service is running, send it a USR1 signal. </dd> @@ -80,26 +80,26 @@ signal. </dd> <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> +<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> +<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. -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> +<dd>Exit. If the service is running, send it a TERM +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> -For example, to send a TERM signal to -/service/socklog-unix, either do # svc -t /service/socklog-unix<br> +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 >/service/socklog-unix/supervise/control<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 @@ -115,11 +115,9 @@ if another <b>runsv</b> is running in <i>service</i>. <p> exit. <h2><a name='sect6'>See Also</a></h2> <i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, <i>runit(8)</i>, <i>runit-init(8)</i>, <i>runsvdir(8)</i>, -<i>runsvchdir(8)</i>, <i>svlogd(8)</i>, <i>svwaitdown(8)</i>, <i>svwaitup(8)</i>, <i>svc(8)</i>, <i>supervise(8)</i> -<p> - <i>http://smarden.org/runit/</i><br> - <i>http://cr.yp.to/daemontools.html</i><br> - +<i>runsvchdir(8)</i>, <i>svlogd(8)</i>, <i>svwaitdown(8)</i>, <i>svwaitup(8)</i>, <p> +<i>http://smarden.org/runit/</i> + <h2><a name='sect7'>Author</a></h2> Gerrit Pape <pape@smarden.org> <p> diff --git a/doc/runsvchdir.8.html b/doc/runsvchdir.8.html index 5a74756..9f6ec73 100644 --- a/doc/runsvchdir.8.html +++ b/doc/runsvchdir.8.html @@ -20,11 +20,11 @@ not start with a dot. <p> <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>/var/service</i> is a symlink to <i>current</i>, and <i><b>runsvdir</b>(8)</i> +is running <i>/var/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/runsvdir.8.html b/doc/runsvdir.8.html index 666bd7c..624c89c 100644 --- a/doc/runsvdir.8.html +++ b/doc/runsvdir.8.html @@ -42,11 +42,9 @@ a TERM signal to each <i><b>runsv</b>(8)</i> process it is monitoring and then e with 111. <h2><a name='sect4'>See Also</a></h2> <i>runsvchdir(8)</i>, <i>runsv(8)</i>, <i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, <i>runit(8)</i>, -<i>runit-init(8)</i>, <i>svlogd(8)</i>, <i>svwaitdown(8)</i>, <i>svwaitup(8)</i>, <i>readproctitle(8)</i>, -<i>svscan(8)</i> <p> - <i>http://smarden.org/runit/</i><br> - <i>http://cr.yp.to/daemontools.html</i><br> - +<i>runit-init(8)</i>, <i>svlogd(8)</i>, <i>svwaitdown(8)</i>, <i>svwaitup(8)</i>, <p> +<i>http://smarden.org/runit/</i> + <h2><a name='sect5'>Author</a></h2> Gerrit Pape <pape@smarden.org> <p> diff --git a/doc/upgrade.html b/doc/upgrade.html index 0183d76..a3c977d 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -10,6 +10,11 @@ <h1>runit - upgrading from previous versions</h1> <hr> +<h3>0.11.x to 0.12.0</h3> +With this version runit supports running under sysvinit on the Solaris +platform. +Replacing init on Solaris is not yet supported. +The service directory now defaults to /var/service instead of /service. <h3>0.10.0 to 0.11.0 or 0.11.1 or 0.11.2</h3> This version introduces the new <a href="chpst.8.html">chpst</a> program, which changes the process state as specified by command line options, and runs diff --git a/package/CHANGES b/package/CHANGES index 236825c..202e7aa 100644 --- a/package/CHANGES +++ b/package/CHANGES @@ -1,3 +1,5 @@ +runit 0.12.0 +Wed, 29 Oct 2003 12:39:28 +0000 * runsv.c: don't use EOVERFLOW as it is not standard (thx Christoph Scheurer). * reboot_system.h1, reboot_system.h2, tryreboot.c: new; test if reboot() diff --git a/package/upgrade b/package/upgrade index 90d16ca..f72676b 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.11.4...' +echo 'Creating symlink runit -> runit-0.12.0...' rm -f runit -ln -s runit-0.11.4 runit +ln -s runit-0.12.0 runit mv -f runit .. echo 'Making command links in /command...' diff --git a/package/versions b/package/versions index bd4a261..cafd15d 100644 --- a/package/versions +++ b/package/versions @@ -19,3 +19,4 @@ 0.11.0 0.11.1 0.11.2 +0.12.0 |