commit 387b51fcd9825c0b68d0f8e56e7c73400b2d78d5
parent fcb14376e3c597ccd6c2e61d33e185c1dd24e4ce
Author: Gerrit Pape <pape@smarden.org>
Date: Sun, 30 Dec 2001 16:34:28 +0000
0.2.6.
Diffstat:
12 files changed, 84 insertions(+), 33 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
DESTDIR=
-PACKAGE=runit-0.2.3
+PACKAGE=runit-0.2.6
DIRS=doc man etc package src
MANPAGES=man/runit.8 man/runit-init.8 man/svwaitdown.8 man/svwaitup.8
DAEMONTOOLS_PD=daemontools-pd-0.76
diff --git a/debian/postinst b/debian/postinst
@@ -25,7 +25,7 @@ set -e
case "$1" in
configure)
( \
- cd /package/admin/runit-0.2.3
+ cd /package/admin/runit-0.2.6
package/upgrade
)
;;
diff --git a/debian/rules b/debian/rules
@@ -23,22 +23,22 @@ build-stamp:
# $(MAKE)
#/usr/bin/docbook-to-man debian/runit.sgml > runit.1
- tar xfzvp runit-0.2.3.tar.gz
- mkdir -p admin/runit-0.2.3/compile
+ tar xfzvp runit-0.2.6.tar.gz
+ mkdir -p admin/runit-0.2.6/compile
tar xfzvp daemontools-pd-0.76.tar.gz \
- -C admin/runit-0.2.3/compile
+ -C admin/runit-0.2.6/compile
( \
- cd admin/runit-0.2.3/compile ; \
+ cd admin/runit-0.2.6/compile ; \
ln -s daemontools-pd-0.76 support ; \
echo 'diet gcc -O2 -Wall' > support/conf-cc ; \
echo 'diet gcc -s -Os -pipe' > support/conf-ld ; \
)
( \
- cd admin/runit-0.2.3 ; \
+ cd admin/runit-0.2.6 ; \
package/compile ; \
- echo "/package/admin/runit-0.2.3" > compile/home ; \
+ echo "/package/admin/runit-0.2.6" > compile/home ; \
rm -f compile/src ; \
- ln -s /package/admin/runit-0.2.3/src compile/src ; \
+ ln -s /package/admin/runit-0.2.6/src compile/src ; \
)
touch build-stamp
@@ -65,40 +65,40 @@ install: build
chmod 1755 debian/runit/package
cp -a admin debian/runit/package/
- rm -rf debian/runit/package/admin/runit-0.2.3/compile
- cp -a debian/runit/package/admin/runit-0.2.3/man .
- rm -rf debian/runit/package/admin/runit-0.2.3/man
- cp -a debian/runit/package/admin/runit-0.2.3/doc .
- rm -rf debian/runit/package/admin/runit-0.2.3/doc
- cp -a debian/runit/package/admin/runit-0.2.3/etc .
- rm -rf debian/runit/package/admin/runit-0.2.3/etc
- cp -a debian/runit/package/admin/runit-0.2.3/package .
+ rm -rf debian/runit/package/admin/runit-0.2.6/compile
+ cp -a debian/runit/package/admin/runit-0.2.6/man .
+ rm -rf debian/runit/package/admin/runit-0.2.6/man
+ cp -a debian/runit/package/admin/runit-0.2.6/doc .
+ rm -rf debian/runit/package/admin/runit-0.2.6/doc
+ cp -a debian/runit/package/admin/runit-0.2.6/etc .
+ rm -rf debian/runit/package/admin/runit-0.2.6/etc
+ cp -a debian/runit/package/admin/runit-0.2.6/package .
# /etc/runit
- cp -p admin/runit-0.2.3/etc/debian/[123] \
+ cp -p admin/runit-0.2.6/etc/debian/[123] \
debian/runit/etc/runit/
- cp -p admin/runit-0.2.3/etc/debian/ctrlaltdel \
+ cp -p admin/runit-0.2.6/etc/debian/ctrlaltdel \
debian/runit/etc/runit/
- cp -p admin/runit-0.2.3/etc/debian/getty-tty5/run \
+ cp -p admin/runit-0.2.6/etc/debian/getty-tty5/run \
debian/runit/etc/runit/getty-tty5
# runit programs
- cp -p debian/runit/package/admin/runit-0.2.3/command/runit* \
+ cp -p debian/runit/package/admin/runit-0.2.6/command/runit* \
debian/runit/sbin/
# cleanup
- rm -rf debian/runit/package/admin/runit-0.2.3/compile
+ rm -rf debian/runit/package/admin/runit-0.2.6/compile
# create debian/links
rm -f debian/links
for i in \
- `cat debian/runit/package/admin/runit-0.2.3/package/commands` ; \
+ `cat debian/runit/package/admin/runit-0.2.6/package/commands` ; \
do \
echo "/package/admin/runit/command/$$i /command/$$i" \
>> debian/links ; \
done
# for i in \
-# `cat debian/runit/package/admin/runit-0.2.3/package/commands` ; \
+# `cat debian/runit/package/admin/runit-0.2.6/package/commands` ; \
# do \
# echo "/command/$$i /usr/local/bin/$$i" \
# >> debian/links ; \
diff --git a/doc/install.html b/doc/install.html
@@ -13,14 +13,14 @@ Check that you have the recent version of
<a href="http://cr.yp.to/daemontools.html">daemontools</a> installed.
<p>
Download
-<a href="runit-0.2.3.tar.gz">runit-0.2.3.tar.gz</a> into <tt>/package</tt>
+<a href="runit-0.2.6.tar.gz">runit-0.2.6.tar.gz</a> into <tt>/package</tt>
and unpack the archive
<pre>
# cd /package
- # gunzip runit-0.2.3.tar
- # tar -xpf runit-0.2.3.tar
- # rm runit-0.2.3.tar
- # cd admin/runit-0.2.3
+ # gunzip runit-0.2.6.tar
+ # tar -xpf runit-0.2.6.tar
+ # rm runit-0.2.6.tar
+ # cd admin/runit-0.2.6
</pre>
Compile and install the <i>runit</i> programs
<pre>
diff --git 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.2.3@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.2.6@smarden.org
</pre>
<hr>
@@ -175,7 +175,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.2.3@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-0.2.6@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/etc/openbsd/1 b/etc/openbsd/1
@@ -0,0 +1,7 @@
+#!/bin/sh
+# system one time tasks
+rm -f /etc/runit/stopit
+
+/bin/sh /etc/rc autoboot
+
+exit 0
diff --git a/etc/openbsd/2 b/etc/openbsd/2
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /command/svscanboot
diff --git a/etc/openbsd/3 b/etc/openbsd/3
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+echo 'Stopping getties...'
+/command/svc -d /service/getty-*
+/command/svwaitdown -t14 /service/getty-* || \
+ ( echo 'Killing getties...' ; /command/svc -k /service/getty-* )
+
+echo 'Stopping services...'
+/command/svc -d /service/*
+/command/svwaitdown -t350 /service/* || \
+ ( echo 'Killing services...' ; /command/svc -k /service/* )
+
+echo 'Stopping log services...'
+/command/svc -d /service/*/log
+/command/svwaitdown -t35 /service/*/log
+
+echo 'Shutdown...'
+if test -r /etc/runit/reboot; then
+ /sbin/reboot
+else
+ /sbin/halt
+fi
+
+exit 0
diff --git a/etc/openbsd/ctrlaltdel b/etc/openbsd/ctrlaltdel
@@ -0,0 +1,8 @@
+#!/bin/sh
+MSG="System is going down in 14 seconds..."
+
+echo 'disabled.' ; exit
+
+/bin/touch /etc/runit/stopit && \
+ /bin/echo "$MSG" | /usr/bin/wall
+/bin/sleep 14
diff --git a/etc/openbsd/getty-ttyC4/run b/etc/openbsd/getty-ttyC4/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/libexec/getty Pc ttyC4
diff --git a/package/CHANGES b/package/CHANGES
@@ -1,3 +1,11 @@
+runit 0.2.6
+Sun, 30 Dec 2001 17:29:29 +0100
+ * runs on openbsd 2.9
+ * runit: console init and reinit
+ * runit: sig_pause() on end.
+ * new: etc/openbsd: stages and getty service
+ * doc: replaceinit: how to replace bsd init
+
runit 0.2.3
Thu, 27 Dec 2001 14:41:56 +0100
* doc: runscripts.html integrated
diff --git 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.2.3...'
+echo 'Creating symlink runit -> runit-0.2.6...'
rm -f runit
-ln -s runit-0.2.3 runit
+ln -s runit-0.2.6 runit
mv -f runit ..
echo 'Making command links in /command...'
