commit 79235a23eaa892525c3bbd581b61e4d587eae4c6
parent adb404afcea8af7c5d05a6a2e5336fff33ff6e3d
Author: Gerrit Pape <pape@smarden.org>
Date: Wed, 16 Oct 2002 11:46:55 +0000
* getties: move utmpset from run to finish scripts.
* runit-run.preinst: wait for ENTER to continue.
* add README.Debian's.
Diffstat:
15 files changed, 67 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+runit (0.7.0-3) unstable; urgency=low
+
+ * getties: move utmpset from run to finish scripts.
+ * runit-run.preinst: wait for ENTER to continue.
+ * add README.Debian's.
+
+ -- Gerrit Pape <pape@smarden.org> Wed, 16 Oct 2002 13:40:10 +0200
+
runit (0.7.0-2) unstable; urgency=low
* rework debian packaging to be debian policy compliant.
diff --git a/debian/getty-tty5.finish b/debian/getty-tty5.finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty5
diff --git a/debian/getty-tty5.run b/debian/getty-tty5.run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /sbin/getty 38400 tty5 linux
diff --git a/debian/rules b/debian/rules
@@ -105,10 +105,14 @@ install: build
chmod 0700 $(CURDIR)/debian/runit/etc/runit/3
install -m0700 admin/runit/etc/debian/ctrlaltdel \
$(CURDIR)/debian/runit/etc/runit/ctrlaltdel
- sed -e 's}^/command/utmpset}utmpset}g' \
- <admin/runit/etc/debian/getty-tty5/run \
- >$(CURDIR)/debian/runit/etc/runit/getty-5/run
- chmod 0755 $(CURDIR)/debian/runit/etc/runit/getty-5/run
+# sed -e 's}^/command/utmpset}utmpset}g' \
+# <admin/runit/etc/debian/getty-tty5/run \
+# >$(CURDIR)/debian/runit/etc/runit/getty-5/run
+# chmod 0755 $(CURDIR)/debian/runit/etc/runit/getty-5/run
+ install -m0755 debian/getty-tty5.run \
+ $(CURDIR)/debian/runit/etc/runit/getty-5/run
+ install -m0755 debian/getty-tty5.finish \
+ $(CURDIR)/debian/runit/etc/runit/getty-5/finish
# lintian overrides
install -m0755 -d $(CURDIR)/debian/runit/usr/share/lintian/overrides
diff --git a/debian/runit-run.README.Debian b/debian/runit-run.README.Debian
@@ -8,8 +8,16 @@ This package diverts sysvinit's /sbin/init binary. Use
to reboot the system with runit as process no 1 after the first
installation of runit-run.
+It's strongly recommended to read and understand the runit documentation
+when using this package: http://smarden.org/runit/
+
+runit's default directory for services is /var/service.
+
This package also sets up the runit package to support runlevels, see
-http://smarden.org/runit/runlevels.html .
+http://smarden.org/runit/runlevels.html. The runit init scheme doesn't use
+init scripts, so new services must be added manually to runlevels. Also on
+upgrades of packages providing services, the required action (e.g.
+restarting of the service) must be done manually.
For service migration from sysvinit to runit, please see
http://smarden.org/runit/replaceinit.html step 5.
diff --git a/debian/runit-run.preinst b/debian/runit-run.preinst
@@ -33,9 +33,13 @@ This package diverts sysvinit's /sbin/init binary. Use
to reboot the system with runit as process no 1 after installing this
package.
+Please read the runit documentation before proceeding:
+
+ http://smarden.org/runit/
+
EOT
- echo -n "Will proceed in 10 seconds, press Ctrl-C to abort... "
- sleep 10s
+ echo -n "Press ENTER to continue, press Ctrl-C to abort... "
+ read input
echo; echo
add_diversion
fi
diff --git a/debian/runit.README.Debian b/debian/runit.README.Debian
@@ -0,0 +1,21 @@
+runit for Debian
+----------------
+
+This package provides the runit programs and configuration files. It does
+not replace /sbin/init and so does not enable runit to run as process no 1.
+To do so, you need to follow the documentation[0] or install the package
+runit-run.
+
+runit's default directory for services is /var/service.
+
+It is possible to use runit's service supervision with sysvinit's init
+running as process no 1. I you want this, add a line to the end of
+/etc/inittab like this:
+
+# echo 'SV:123456:respawn:/etc/runit/2' >>/etc/inittab
+
+and tell sysvinit about the change:
+
+# init q
+
+ -- Gerrit Pape <pape@smarden.org>, Wed, 16 Oct 2002 13:24:32 +0200
diff --git a/man/runsv.8 b/man/runsv.8
@@ -130,7 +130,7 @@ on your systems does not provide the -n option, leave it out,
.B runsv
ignores unknown characters written to the control pipe.
.BR echo (1)
-usally blocks if no
+usually blocks if no
.B runsv
process is running in the service directory.
.SH SIGNALS
diff --git a/runit-run/Makefile b/runit-run/Makefile
@@ -2,5 +2,7 @@ DESTDIR=
install:
for i in 2 3 4; do install -d $(DESTDIR)/etc/runit/getty-$$i; done
- for i in 2 3 4; do install -m0755 getty-$$i/run \
- $(DESTDIR)/etc/runit/getty-$$i/run; done
+ for i in 2 3 4; do \
+ install -m0755 getty-$$i/run $(DESTDIR)/etc/runit/getty-$$i/run; \
+ install -m0755 getty-$$i/finish $(DESTDIR)/etc/runit/getty-$$i/finish; \
+ done
diff --git a/runit-run/getty-2/finish b/runit-run/getty-2/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty2
diff --git a/runit-run/getty-2/run b/runit-run/getty-2/run
@@ -1,3 +1,2 @@
#!/bin/sh
-utmpset -w tty2
exec getty 38400 tty2 linux
diff --git a/runit-run/getty-3/finish b/runit-run/getty-3/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty3
diff --git a/runit-run/getty-3/run b/runit-run/getty-3/run
@@ -1,3 +1,2 @@
#!/bin/sh
-utmpset -w tty3
exec getty 38400 tty3 linux
diff --git a/runit-run/getty-4/finish b/runit-run/getty-4/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec utmpset -w tty4
diff --git a/runit-run/getty-4/run b/runit-run/getty-4/run
@@ -1,3 +1,2 @@
#!/bin/sh
-utmpset -w tty4
exec getty 38400 tty4 linux
