diff options
| author | Gerrit Pape <pape@smarden.org> | 2002-09-26 11:19:08 +0000 |
|---|---|---|
| committer | Gerrit Pape <pape@smarden.org> | 2002-09-26 11:19:08 +0000 |
| commit | 25e557bdc3b889d4fc0f43abb2d1405f2a5e5bb7 (patch) | |
| tree | 526a73fc0e1ca0f703450b6a0f2a8f6186bea2b2 | |
| parent | 9f07ba95a4e18f06fbf329905ae0ad4cf86c3f99 (diff) | |
| download | runit-25e557bdc3b889d4fc0f43abb2d1405f2a5e5bb7.tar.gz runit-25e557bdc3b889d4fc0f43abb2d1405f2a5e5bb7.tar.xz runit-25e557bdc3b889d4fc0f43abb2d1405f2a5e5bb7.zip | |
adapt stage 3.
| -rwxr-xr-x | etc/debian/3 | 17 | ||||
| -rwxr-xr-x | etc/freebsd/3 | 23 | ||||
| -rwxr-xr-x | etc/openbsd/3 | 26 | ||||
| -rw-r--r-- | runit-0.5.4.tar.gz | bin | 49559 -> 51082 bytes |
4 files changed, 22 insertions, 44 deletions
diff --git a/etc/debian/3 b/etc/debian/3 index 83512a2..486c7d1 100755 --- a/etc/debian/3 +++ b/etc/debian/3 @@ -1,21 +1,14 @@ #!/bin/sh +exec 2>&1 LAST=0 test -r /etc/runit/reboot && LAST=6 -echo 'Stopping getties...' -/command/svc -d /service/getty-* -/command/svwaitdown -t14 /service/getty-* || \ - ( echo 'Killing getties...' ; /command/svc -k /service/getty-* ) +echo 'Waiting for getties to stop...' +/command/svwaitdown -xk -t14 /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 'Waiting for services to stop...' +/command/svwaitdown -xk -t350 /service/* echo 'Shutdown...' /etc/init.d/rc $LAST diff --git a/etc/freebsd/3 b/etc/freebsd/3 index d2514c4..486c7d1 100755 --- a/etc/freebsd/3 +++ b/etc/freebsd/3 @@ -1,21 +1,16 @@ #!/bin/sh -PATH=/bin:/sbin:/command +exec 2>&1 -echo 'Stopping services...' -svc -d /service/* -svwaitdown -t350 /service/* || ( echo 'Killing services...' ; \ - svc -k /service/* ; svwaitdown /service/* ) +LAST=0 +test -r /etc/runit/reboot && LAST=6 -echo 'Stopping log services...' -svc -d /service/*/log -svwaitdown -t35 /service/*/log || ( echo 'Killing log services...' ; \ - svc -k /service/*/log ; svwaitdown /service/*/log ) +echo 'Waiting for getties to stop...' +/command/svwaitdown -xk -t14 /service/getty-* + +echo 'Waiting for services to stop...' +/command/svwaitdown -xk -t350 /service/* echo 'Shutdown...' -if test -r /etc/runit/reboot; then - exec reboot -else - exec halt -fi +/etc/init.d/rc $LAST exit 0 diff --git a/etc/openbsd/3 b/etc/openbsd/3 index 192c6d8..486c7d1 100755 --- a/etc/openbsd/3 +++ b/etc/openbsd/3 @@ -1,26 +1,16 @@ #!/bin/sh -PATH=/bin:/sbin:/command +exec 2>&1 -echo 'Stopping getties...' -svc -d /service/getty-* -svwaitdown -t14 /service/getty-* || ( echo 'Killing getties...' ; \ - svc -k /service/getty-* ; svwaitdown /service/getty-* ) +LAST=0 +test -r /etc/runit/reboot && LAST=6 -echo 'Stopping services...' -svc -d /service/* -svwaitdown -t350 /service/* || ( echo 'Killing services...' ; \ - svc -k /service/* ; svwaitdown /service/* ) +echo 'Waiting for getties to stop...' +/command/svwaitdown -xk -t14 /service/getty-* -echo 'Stopping log services...' -svc -d /service/*/log -svwaitdown -t35 /service/*/log || ( echo 'Killing log services...' ; \ - svc -k /service/*/log ; svwaitdown /service/*/log ) +echo 'Waiting for services to stop...' +/command/svwaitdown -xk -t350 /service/* echo 'Shutdown...' -if test -r /etc/runit/reboot; then - exec reboot -else - exec halt -fi +/etc/init.d/rc $LAST exit 0 diff --git a/runit-0.5.4.tar.gz b/runit-0.5.4.tar.gz index e722489..bf59b27 100644 --- a/runit-0.5.4.tar.gz +++ b/runit-0.5.4.tar.gz Binary files differ |