From fce76d277e1583e7eadc7a12fc2bfc9a4a638c69 Mon Sep 17 00:00:00 2001 From: Gerrit Pape Date: Sat, 3 May 2003 16:00:25 +0000 Subject: 0.9.2. debianized. --- Makefile | 2 +- debian/changelog | 6 +++++ debian/rules | 30 ++++++++++----------- doc/install.html | 10 +++---- doc/replaceinit.html | 4 +-- doc/runsv.8.html | 14 +++++----- doc/svwaitdown.8.html | 72 +++++++++++++++++++++++++-------------------------- doc/svwaitup.8.html | 61 ++++++++++++++++++++++--------------------- 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 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 /package directory, create it now: # chmod 1755 /package Download -runit-0.9.1.tar.gz into /package +runit-0.9.2.tar.gz into /package and unpack the archive
   # 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
 
Compile and install the runit programs
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 runit.
 
To report success:
-  # ( 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
 

@@ -188,7 +188,7 @@ Use init 6 to reboot and init 0 to halt a system that runs

To report success:

-  # ( 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
 

Step 5: Service migration

The goal is to migrate all services from /etc/rc.* 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 service and starts ./run. if ./run exits and ./finish exists, runsv starts ./finish. If ./finish doesn't exist or ./finish exits, runsv restarts ./run.

-If ./run or ./finish exit immediatly, runsv waits a second -before starting ./finish or restarting ./run.

-If the file service/down exists, -runsv does not start ./run immediately. The control interface (see below) -can be used to start the service and to give other commands to runsv.

-If -the directory service/log exists, runsv creates a pipe, redirects service/run's +If ./run or ./finish exit immediately, runsv waits a +second before starting ./finish or restarting ./run.

+If the file service/down +exists, runsv does not start ./run immediately. The control interface (see +below) can be used to start the service and to give other commands to runsv. +

+If the directory service/log exists, runsv creates a pipe, redirects service/run's and service/finish's standard output to the pipe, switches to the directory service/log and starts ./run (and ./finish) exactly as described above for the service 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 @@ G. Pape
runit


Name

-svwaitdown - waits for services controlled by supervise(8) to be down - +svwaitdown - waits for services controlled by runsv(8) or supervise(8) +to be down

Synopsis

svwaitdown [ -v ] [ -k ] [ -t sec ] services

Description

-services consists -of one or more arguments. Each service directory must start with a slash. -

-svwaitdown sends each service given at the command line the ``down'' command, -and waits for it to become down. The services given at the command line -must be controlled by supervise(8).

-svwaitdown blocks, limited by a timeout, -until all services are down or reports errors. +services +consists of one or more arguments. Each service directory must start with +a slash.

+svwaitdown sends each service given at the command line the ``down'' +command, and waits for it to become down. The services given at the command +line must be controlled by runsv(8), or supervise(8).

+svwaitdown blocks, +limited by a timeout, until all services are down or reports errors.

Options

-
-v
-
verbose. Print verbose -messages to stderr.
+
-v +
+
verbose. Print verbose messages to stderr.
-t sec
-
Set the timeout for waiting for services to become -down to sec seconds. sec must be between 2 and 6000. Default is 600 (10 minutes). -
+
Set the timeout for waiting +for services to become down to sec seconds. sec must be between 2 and 6000. +Default is 600 (10 minutes).
-k
-
Kill. If the timeout is reached before all services are down, tell the -supervise(8) processes to send the services a KILL signal.
+
Kill. If the timeout is reached before all +services are down, tell the runsv(8) processes to send the services a KILL +signal.
-x
-
Exit. Send each -service the ``exit'' command additionally to the ``down'' command, and wait for -the corresponding runsv(8) processes to exit instead for the services to -be down. This option should only be used by runit(8) in stage 3 when runsvdir(8) -is already stopped.

-

+
Exit. Send each service the ``exit'' command additionally to the ``down'' +command, and wait for the corresponding runsv(8) processes to exit instead +for the services to be down. This option should only be used by runit(8) +in stage 3 when runsvdir(8) is already stopped.

Exit Codes

-svwaitdown returns 0 as soon as all services -are down.

-If a service is usually controlled by supervise(8), but no supervise(8) -process is currently running, svwaitdown treats this service as if it would -be down.

-For each service that causes an error while checking, svwaitdown -increases the exit code by one and exits non zero. The maximum is 100.

-svwaitdown -returns 111 if the timeout sec was reached. +svwaitdown returns +0 as soon as all services are down.

+If a service is usually controlled by +runsv (8) or supervise(8), but no supervisor process is currently running, +svwaitdown treats this service as if it would be down.

+For each service +that causes an error while checking, svwaitdown increases the exit code +by one and exits non zero. The maximum is 100.

+svwaitdown returns 111 if +the timeout sec was reached.

See Also

-svwaitdown(8), runsv(8), -runsvctrl(8), runsvstat(8), runsvdir(8), runsvchdir(8), runit(8), runit-init(8), -supervise(8), svscan(8)

+svwaitdown(8), runsv(8), runsvctrl(8), +runsvstat(8), runsvdir(8), runsvchdir(8), runit(8), runit-init(8), supervise(8), +svscan(8)

http://smarden.org/runit/
http://cr.yp.to/daemontools.html
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 @@ G. Pape
runit


Name

-svwaitup - waits for services controlled by supervise(8) to be up +svwaitup - waits for services controlled by runsv(8) or supervise(8) +to be up

Synopsis

-svwaitup -[ -v ] [ -s sec ] services +svwaitup [ -v ] [ -s sec ] services

Description

-services consist of one or more arguments. -Each service directory must start with a slash.

-svwaitup checks each service -given at the command line for being at least the specified number of seconds -sec up. The services given at the command line must be controlled by supervise(8). -

-svwaitup blocks until all services were up and running at least sec seconds -when svwaitup was checking or reports errors. +services +consist of one or more arguments. Each service directory must start with +a slash.

+svwaitup checks each service given at the command line for being +at least the specified number of seconds sec up. The services given at the +command line must be controlled by runsv(8), or supervise(8).

+svwaitup blocks +until all services were up and running at least sec seconds when svwaitup +was checking or reports errors.

Options

-v
-
verbose. Print verbose -messages to stderr.
+
verbose. Print verbose messages +to stderr.
-s sec
-
Set the minimum number of seconds each service -has to be up to sec seconds. sec must be between 2 and 600. Default is 2. -
+
Set the minimum number of seconds each service has to be +up to sec seconds. sec must be between 2 and 600. Default is 2.

Exit Codes

-svwaitup returns 0 as soon as all services were at least sec -seconds up.

-Note: If svwaitup exits 0, it does not guarantee that all services -are actually running. A service could have crashed immediatly after svwaitup -was successfully checking it to be up sec seconds. services should be designed -not to rely on svwaitup to resolve dependencies.

-For each service that is -down and not requested to become up, or that causes an error while checking -(e.g. supervise(8) is not running), svwaitup increases the exit code by one -and exits non zero. The maximum is 100.

+svwaitup +returns 0 as soon as all services were at least sec seconds up.

+Note: If +svwaitup exits 0, it does not guarantee that all services are actually +running. A service could have crashed immediatly after svwaitup was successfully +checking it to be up sec seconds. services should be designed not to rely +on svwaitup to resolve dependencies.

+For each service that is down and not +requested to become up, or that causes an error while checking (e.g. runsv(8) +is not running), svwaitup increases the exit code by one and exits non +zero. The maximum is 100.

svwaitup returns 111 on error. -

See -Also

-svwaitdown(8), runsv(8), runsvctrl(8), runsvstat(8), runsvdir(8), runsvchdir(8), -runit(8), runit-init(8), supervise(8), svscan(8)

+

See Also

+svwaitdown(8), +runsv(8), runsvctrl(8), runsvstat(8), runsvdir(8), runsvchdir(8), runit(8), +runit-init(8), supervise(8), svscan(8)

http://smarden.org/runit/
http://cr.yp.to/daemontools.html
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...' -- cgit 1.4.1