* doc/faq.html: new.

  * doc/benefits.html: use sv program instead of runsvstat, runsvctrl;
    minor.
  * doc/replaceinit.html, doc/runlevels.html: put getty service directory
    into /etc/sv/.
  * doc/runscripts.html: use sv program instead of svwaitup.
  * etc/*/3, etc/macosx/StartupItems/runit: use sv program instead of
    svwaitdown.
  * man/runsv.8: use sv program instead of runsvctrl.
  * man/sv.8: minor.
  * Makefile, package/commands: no longer build/install runsvctrl,
    runsvstat, svwaitdown, svwaitup.
  * man/runsvctrl.8, man/runsvstat.8, man/svwaitdown.8, man/svwaitup.8:
    remove; obsolete.
  * doc/index.html: add faq; remove runsvctrl, runsvstat, svwaitdown,
    svwaitup.
  * sv.c: fix usage output.

4 files changed, 8 insertions, 10 deletions

diff --git a/etc/debian/3 b/etc/debian/3
index e014e13..5931ce6 100755
--- a/etc/debian/3
+++ b/etc/debian/3
@@ -6,11 +6,9 @@ PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin
 LAST=0
 test -x /etc/runit/reboot && LAST=6
 
-echo 'Waiting for getties to stop...'
-svwaitdown -xk -t14 /var/service/getty-*
-
 echo 'Waiting for services to stop...'
-svwaitdown -xk -t350 /var/service/*
+sv -w196 force-stop /var/service/*
+sv exit /var/service/*
 
 echo 'Shutdown...'
 /etc/init.d/rc $LAST
diff --git a/etc/freebsd/3 b/etc/freebsd/3
index b04f4af..c30bdb1 100755
--- a/etc/freebsd/3
+++ b/etc/freebsd/3
@@ -4,7 +4,8 @@ exec 2>&1
 PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin
 
 echo 'Waiting for services to stop...'
-svwaitdown -xk -t350 /var/service/*
+sv -w196 force-stop /var/service/*
+sv exit /var/service/*
 
 echo 'Shutdown...'
 if test -x /etc/runit/reboot; then
diff --git a/etc/macosx/StartupItems/runit b/etc/macosx/StartupItems/runit
index 916d769..6b4f0c4 100755
--- a/etc/macosx/StartupItems/runit
+++ b/etc/macosx/StartupItems/runit
@@ -12,7 +12,8 @@ StartService() {
 }
 StopService() {
   ConsoleMessage "Stopping runit service supervision"
-  svwaitdown -xk -t14 /var/service/*
+  sv -w196 force-stop /var/service/*
+  sv exit /var/service/*
 }
 RestartService() {
   return 0
diff --git a/etc/openbsd/3 b/etc/openbsd/3
index b868031..c30bdb1 100755
--- a/etc/openbsd/3
+++ b/etc/openbsd/3
@@ -3,11 +3,9 @@ exec 2>&1
 
 PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin
 
-echo 'Waiting for getties to stop...'
-svwaitdown -xk -t14 /var/service/getty-*
-
 echo 'Waiting for services to stop...'
-svwaitdown -xk -t350 /var/service/*
+sv -w196 force-stop /var/service/*
+sv exit /var/service/*
 
 echo 'Shutdown...'
 if test -x /etc/runit/reboot; then