diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | doc/install.html | 12 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/runsvdir.8.html | 56 | ||||
| -rw-r--r-- | doc/upgrade.html | 3 | ||||
| -rw-r--r-- | doc/utmpset.8.html | 9 | ||||
| -rw-r--r-- | man/runsvdir.8 | 4 | ||||
| -rw-r--r-- | package/CHANGES | 3 | ||||
| -rw-r--r-- | package/COPYING | 2 | ||||
| -rw-r--r-- | package/THANKS | 5 | ||||
| -rw-r--r-- | package/commands | 8 | ||||
| -rwxr-xr-x | package/compile | 8 | ||||
| -rwxr-xr-x | package/install-man | 11 | ||||
| -rwxr-xr-x | package/upgrade | 10 | ||||
| -rw-r--r-- | package/versions | 1 |
16 files changed, 71 insertions, 73 deletions
diff --git a/Makefile b/Makefile index e53dcd2..035411f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-0.13.1 +PACKAGE=runit-1.0.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/rules b/debian/rules index e1576b2..e076512 100755 --- a/debian/rules +++ b/debian/rules @@ -40,11 +40,11 @@ DIR =`pwd`/debian/runit build: deb-checkdir build-stamp build-stamp: - tar xfzp runit-0.13.1.tar.gz + tar xfzp runit-1.0.0.tar.gz -gcc -v ( \ - cd admin/runit-0.13.1/src && \ - ln -s runit-0.13.1 runit && mv runit ../.. && \ + cd admin/runit-1.0.0/src && \ + ln -s runit-1.0.0 runit && mv runit ../.. && \ echo "$(CC) $(CFLAGS)" >conf-cc && \ echo "$(CC) $(LDFLAGS)" >conf-ld && \ $(MAKE); \ diff --git a/doc/install.html b/doc/install.html index 428a6fa..a1ca220 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.13.1.tar.gz">runit-0.13.1.tar.gz</a> into <tt>/package</tt> +<a href="runit-1.0.0.tar.gz">runit-1.0.0.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-0.13.1.tar - # tar -xpf runit-0.13.1.tar - # rm runit-0.13.1.tar - # cd admin/runit-0.13.1 + # gunzip runit-1.0.0.tar + # tar -xpf runit-1.0.0.tar + # rm runit-1.0.0.tar + # cd admin/runit-1.0.0 </pre> On MacOSX, do <pre> @@ -43,7 +43,7 @@ hierarchy, do: </pre> To report success: <pre> - # mail pape-runit-0.13.1@smarden.org <compile/sysdeps + # mail pape-runit-1.0.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 66c8b45..f118e87 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -117,7 +117,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-0.13.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.0.0@smarden.org </pre> <hr> @@ -206,7 +206,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-0.13.1@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-1.0.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/runsvdir.8.html b/doc/runsvdir.8.html index 624c89c..73c97c8 100644 --- a/doc/runsvdir.8.html +++ b/doc/runsvdir.8.html @@ -15,36 +15,36 @@ runsvdir - starts and monitors a collection of <i>runsv(8)</i> processes <i>dir</i> [ <i>log</i> ] <h2><a name='sect2'>Description</a></h2> <i>dir</i> must be a directory. <i>log</i> is a space holder for -a readproctitle log and must be at least seven characters long. <p> -<b>runsvdir</b> -starts a <i><b>runsv</b>(8)</i> process for each subdirectory in <i>dir</i>, up to a limit of -1000 subdirectories. <b>runsvdir</b> skips subdirectory names starting with dots. -<i><b>runsv</b>(8)</i> must be in <b>runsvdir</b>’s PATH. <p> -At least every five seconds, <b>runsvdir</b> -checks if <i>dir</i> has changed. If it sees a new subdirectory in <i>dir</i>, it starts -a new <i><b>runsv</b>(8)</i> process. If it sees an old sudirectory where a <i><b>runsv</b>(8)</i> process -has exited, it restarts the <i><b>runsv</b>(8)</i> process. If <b>runsvdir</b> sees a subdirectory -being removed that was previously there, it sends the corresponding <i><b>runsv</b>(8)</i> -process a TERM signal, stops monitoring this process, and so does not restart -the <i><b>runsv</b>(8)</i> process if it exits. <p> -If the <i>log</i> argument is given to <b>runsvdir</b>, -all output to standard error is redirected to this <i>log</i>, which is similar -to the <i><b>readproctitle</b>(8)</i> log. To see the most recent error messages, use -a process-listing tool such as <i><b>ps</b>(1)</i>. <b>runsvdir</b> writes a dot to the readproctitle -log every 15 minutes so that old error messages expire. <p> -Normally <b>runsvdir</b> -is started by <i><b>runit</b>(8)</i> in stage 2. +a readproctitle log, and must be at least seven characters long or absent. +<p> +<b>runsvdir</b> starts a <i><b>runsv</b>(8)</i> process for each subdirectory in <i>dir</i>, up to +a limit of 1000 subdirectories. <b>runsvdir</b> skips subdirectory names starting +with dots. <i><b>runsv</b>(8)</i> must be in <b>runsvdir</b>’s PATH. <p> +At least every five seconds, +<b>runsvdir</b> checks if <i>dir</i> has changed. If it sees a new subdirectory in <i>dir</i>, +it starts a new <i><b>runsv</b>(8)</i> process. If it sees an old sudirectory where a +<i><b>runsv</b>(8)</i> process has exited, it restarts the <i><b>runsv</b>(8)</i> process. If <b>runsvdir</b> +sees a subdirectory being removed that was previously there, it sends the +corresponding <i><b>runsv</b>(8)</i> process a TERM signal, stops monitoring this process, +and so does not restart the <i><b>runsv</b>(8)</i> process if it exits. <p> +If the <i>log</i> argument +is given to <b>runsvdir</b>, all output to standard error is redirected to this +<i>log</i>, which is similar to the <i><b>readproctitle</b>(8)</i> log. To see the most recent +error messages, use a process-listing tool such as <i><b>ps</b>(1)</i>. <b>runsvdir</b> writes +a dot to the readproctitle log every 15 minutes so that old error messages +expire. <p> +Normally <b>runsvdir</b> is started by <i><b>runit</b>(8)</i> in stage 2. <h2><a name='sect3'>Signals</a></h2> -If <b>runsvdir</b> receives a TERM signal, -it exits with 0 immediately. <p> -If <b>runsvdir</b> receives a HUP signal, it sends -a TERM signal to each <i><b>runsv</b>(8)</i> process it is monitoring and then exits -with 111. +If <b>runsvdir</b> +receives a TERM signal, it exits with 0 immediately. <p> +If <b>runsvdir</b> receives +a HUP signal, it sends a TERM signal to each <i><b>runsv</b>(8)</i> process it is monitoring +and then exits 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>, <p> -<i>http://smarden.org/runit/</i> - +<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>, +<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 5b57f4f..f648d79 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -9,7 +9,8 @@ <hr> <h1>runit - upgrading from previous versions</h1> <hr> - +<h3>0.13.0 or 0.13.1 to 1.0.0</h3> +No further action from you is required. <h3>0.12.0 or 0.12.1 to 0.13.0 or 0.13.1</h3> runit's service logging daemon <a href="svlogd.8.html">svlogd</a> now can be configured to transmit selected log messages through UDP. diff --git a/doc/utmpset.8.html b/doc/utmpset.8.html index 680ad72..d7d9d04 100644 --- a/doc/utmpset.8.html +++ b/doc/utmpset.8.html @@ -22,10 +22,11 @@ for local login accounting. The <i><b>runit</b>(8)</i> program doesn’t inc update the utmp file, the <i><b>getty</b>(8)</i> processes are handled the same as all other services. <p> To enable local login accounting, add <b>utmpset</b> to the <i><b>getty</b>(8)</i> -run scripts, e.g.: <p> - #!/bin/sh<br> - /command/utmpset -w tty5<br> - exec /sbin/getty 38400 tty5 linux<br> +<i>finish</i> scripts, e.g.: <p> + $ cat /var/service/getty-5/finish<br> + #!/bin/sh<br> + exec utmpset -w tty5<br> + $<br> <h2><a name='sect3'>Options</a></h2> diff --git a/man/runsvdir.8 b/man/runsvdir.8 index 6d61e75..7b6470d 100644 --- a/man/runsvdir.8 +++ b/man/runsvdir.8 @@ -11,8 +11,8 @@ runsvdir \- starts and monitors a collection of runsv(8) processes .I dir must be a directory. .I log -is a space holder for a readproctitle log and must be at least seven -characters long. +is a space holder for a readproctitle log, and must be at least seven +characters long or absent. .P .B runsvdir starts a diff --git a/package/CHANGES b/package/CHANGES index b873625..54573d3 100644 --- a/package/CHANGES +++ b/package/CHANGES @@ -1,7 +1,10 @@ +runit 1.0.0 +Tue, 10 Feb 2004 12:55:07 +0000 * doc/benefits.html, doc/dependencies.html, doc/index.html, doc/replaceinit.html, doc/runlevels.html, doc/upgrade.html, doc/useinit.html: cleanup; minor. * man/utmpset.8: run utmpset in finish script, not run script. + * man/runsvdir.8: minor. runit 0.13.1 Mon, 19 Jan 2004 18:32:58 +0000 diff --git a/package/COPYING b/package/COPYING index 5e3a97a..067ca95 100644 --- a/package/COPYING +++ b/package/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2001-2003, Gerrit Pape +Copyright (c) 2001-2004, Gerrit Pape All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/package/THANKS b/package/THANKS index e21e1c9..b84e3fe 100644 --- a/package/THANKS +++ b/package/THANKS @@ -1,3 +1,2 @@ -Thanks to D. J. Bernstein for his daemontools package and for putting -daemontools' library code into the public domain, this package wouldn't -exist if Bernstein did not make the daemontools package available. +Thanks to D. J. Bernstein for his daemontools package and for putting the +daemontools' library code into the public domain. diff --git a/package/commands b/package/commands index 94655e7..dcc69f8 100644 --- a/package/commands +++ b/package/commands @@ -1,12 +1,12 @@ +chpst runit runit-init runsv -runsvdir runsvchdir -svwaitdown runsvctrl +runsvdir runsvstat -svwaitup svlogd -chpst +svwaitdown +svwaitup utmpset diff --git a/package/compile b/package/compile index 89dc466..7feef7a 100755 --- a/package/compile +++ b/package/compile @@ -7,12 +7,11 @@ test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` mkdir -p compile command -test -r compile/home || echo $here > compile/home +test -r compile/home || echo $here >compile/home test -h compile/src || ln -s $here/src compile/src echo 'Linking ./src/* into ./compile...' -for i in `ls src` -do +for i in `ls src`; do test -h compile/$i || ln -s src/$i compile/$i done @@ -20,8 +19,7 @@ echo 'Compiling everything in ./compile...' ( cd compile; exec make ) || exit 1 echo 'Copying commands into ./command...' -for i in `cat package/commands` -do +for i in `cat package/commands`; do rm -f command/$i'{new}' cp -p compile/$i command/$i'{new}' mv -f command/$i'{new}' command/$i diff --git a/package/install-man b/package/install-man index f5294b8..1cb1915 100755 --- a/package/install-man +++ b/package/install-man @@ -8,18 +8,15 @@ here=`env - PATH=$PATH pwd` parent=`dirname $here` echo 'Compressing manpages...' -for i in man/*.[1-8] -do - gzip -c $i > ${i}.gz +for i in man/*.[1-8]; do + gzip -c $i >${i}.gz done echo 'Making manpage links in /usr/local/man...' cd man -for i in 8 -do +for i in 8; do mkdir -p /usr/local/man/man$i - for j in *.$i - do + for j in *.$i; do rm -f /usr/local/man/man$i/$j.gz'{new}' ln -s $parent/runit/man/$j.gz /usr/local/man/man$i/$j.gz'{new}' mv -f /usr/local/man/man$i/$j.gz'{new}' /usr/local/man/man$i/$j.gz diff --git a/package/upgrade b/package/upgrade index b050072..5065aac 100755 --- a/package/upgrade +++ b/package/upgrade @@ -7,23 +7,21 @@ test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` parent=`dirname $here` -echo 'Creating symlink runit -> runit-0.13.1...' +echo 'Creating symlink runit -> runit-1.0.0...' rm -f runit -ln -s runit-0.13.1 runit +ln -s runit-1.0.0 runit mv -f runit .. echo 'Making command links in /command...' mkdir -p /command -for i in `cat package/commands` -do +for i in `cat package/commands`; do rm -f /command/$i'{new}' ln -s $parent/runit/command/$i /command/$i'{new}' mv -f /command/$i'{new}' /command/$i done echo 'Making compatibility links in /usr/local/bin...' mkdir -p /usr/local/bin -for i in `cat package/commands` -do +for i in `cat package/commands`; do rm -f /usr/local/bin/$i'{new}' ln -s /command/$i /usr/local/bin/$i'{new}' mv -f /usr/local/bin/$i'{new}' /usr/local/bin/$i diff --git a/package/versions b/package/versions index 74ef58d..cddf044 100644 --- a/package/versions +++ b/package/versions @@ -23,3 +23,4 @@ 0.12.1 0.13.0 0.13.1 +1.0.0 |