| 1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools mezzanine_patched_e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools |
| 2 |
|
|
--- e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools 2007-02-16 12:11:45.000000000 -0700 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools 2007-02-16 12:11:16.000000000 -0700 |
| 4 |
|
|
@@ -20,7 +20,7 @@ |
| 5 |
|
|
. /etc/rc.d/init.d/functions |
| 6 |
|
|
|
| 7 |
|
|
# The maximum amount of time to wait for a process to shut down, in seconds. |
| 8 |
|
|
-WAITMAX=60 |
| 9 |
|
|
+SVWAIT=60 |
| 10 |
|
|
|
| 11 |
|
|
start() |
| 12 |
|
|
{ |
| 13 |
|
|
@@ -29,7 +29,7 @@ |
| 14 |
|
|
if [ -d $1/log ]; then |
| 15 |
|
|
dirs="$1/log $1" |
| 16 |
|
|
fi |
| 17 |
|
|
- /usr/bin/runsvctrl u $dirs |
| 18 |
|
|
+ /usr/bin/sv start $dirs > /dev/null |
| 19 |
|
|
if [ $? -ne 0 ]; then |
| 20 |
|
|
failure "Starting $SERVICE" |
| 21 |
|
|
else |
| 22 |
|
|
@@ -38,15 +38,10 @@ |
| 23 |
|
|
/bin/echo |
| 24 |
|
|
} |
| 25 |
|
|
|
| 26 |
|
|
-status() |
| 27 |
|
|
-{ |
| 28 |
|
|
- /usr/bin/runsvstat $1 |
| 29 |
|
|
-} |
| 30 |
|
|
- |
| 31 |
|
|
stop() |
| 32 |
|
|
{ |
| 33 |
|
|
/bin/echo -n "Stopping $SERVICE:" |
| 34 |
|
|
- /usr/bin/svwaitdown -t $WAITMAX $1 |
| 35 |
|
|
+ /usr/bin/sv stop $1 > /dev/null |
| 36 |
|
|
if [ $? -ne 0 ]; then |
| 37 |
|
|
failure "Stopping $SERVICE" |
| 38 |
|
|
else |
| 39 |
|
|
@@ -67,8 +62,8 @@ |
| 40 |
|
|
if [ -e log ]; then |
| 41 |
|
|
dirs="$dirs ./log" |
| 42 |
|
|
fi |
| 43 |
|
|
- /usr/bin/runsvctrl d $dirs |
| 44 |
|
|
- /usr/bin/runsvctrl x $dirs |
| 45 |
|
|
+ /usr/bin/sv stop $dirs |
| 46 |
|
|
+ /usr/bin/sv exit $dirs |
| 47 |
|
|
if [ $? -ne 0 ]; then |
| 48 |
|
|
failure "Disabling $SERVICE" |
| 49 |
|
|
else |
| 50 |
|
|
@@ -80,48 +75,47 @@ |
| 51 |
|
|
case $1 in |
| 52 |
|
|
|
| 53 |
|
|
restart) |
| 54 |
|
|
- action "Restarting $SERVICE" /usr/bin/runsvctrl t $SERVICE_DIR |
| 55 |
|
|
- /usr/bin/runsvctrl u $SERVICE_DIR |
| 56 |
|
|
+ action "Restarting $SERVICE" /usr/bin/sv restart $SERVICE_DIR |
| 57 |
|
|
;; |
| 58 |
|
|
|
| 59 |
|
|
sigalrm) |
| 60 |
|
|
- action "Sending ALRM signal to $SERVICE" /usr/bin/runsvctrl a $SERVICE_DIR |
| 61 |
|
|
+ action "Sending ALRM signal to $SERVICE" /usr/bin/sv alarm $SERVICE_DIR |
| 62 |
|
|
;; |
| 63 |
|
|
|
| 64 |
|
|
sigcont) |
| 65 |
|
|
- action "Sending CONT signal to $SERVICE" /usr/bin/runsvctrl c $SERVICE_DIR |
| 66 |
|
|
+ action "Sending CONT signal to $SERVICE" /usr/bin/sv cont $SERVICE_DIR |
| 67 |
|
|
;; |
| 68 |
|
|
|
| 69 |
|
|
sighup) |
| 70 |
|
|
- action "Sending HUP signal to $SERVICE" /usr/bin/runsvctrl h $SERVICE_DIR |
| 71 |
|
|
+ action "Sending HUP signal to $SERVICE" /usr/bin/sv hup $SERVICE_DIR |
| 72 |
|
|
;; |
| 73 |
|
|
|
| 74 |
|
|
sigusr1) |
| 75 |
|
|
- action "Sending USR1 signal to $SERVICE" /usr/bin/runsvctrl 1 $SERVICE_DIR |
| 76 |
|
|
+ action "Sending USR1 signal to $SERVICE" /usr/bin/sv 1 $SERVICE_DIR |
| 77 |
|
|
;; |
| 78 |
|
|
|
| 79 |
|
|
sigusr2) |
| 80 |
|
|
- action "Sending USR2 signal to $SERVICE" /usr/bin/runsvctrl 2 $SERVICE_DIR |
| 81 |
|
|
+ action "Sending USR2 signal to $SERVICE" /usr/bin/sv 2 $SERVICE_DIR |
| 82 |
|
|
;; |
| 83 |
|
|
|
| 84 |
|
|
sigint) |
| 85 |
|
|
- action "Sending INT signal to $SERVICE" /usr/bin/runsvctrl i $SERVICE_DIR |
| 86 |
|
|
+ action "Sending INT signal to $SERVICE" /usr/bin/sv interrupt $SERVICE_DIR |
| 87 |
|
|
;; |
| 88 |
|
|
|
| 89 |
|
|
sigkill) |
| 90 |
|
|
- action "Sending KILL signal to $SERVICE" /usr/bin/runsvctrl k $SERVICE_DIR |
| 91 |
|
|
+ action "Sending KILL signal to $SERVICE" /usr/bin/sv kill $SERVICE_DIR |
| 92 |
|
|
;; |
| 93 |
|
|
|
| 94 |
|
|
sigstop) |
| 95 |
|
|
- action "Sending STOP signal to $SERVICE" /usr/bin/runsvctrl p $SERVICE_DIR |
| 96 |
|
|
+ action "Sending STOP signal to $SERVICE" /usr/bin/sv pause $SERVICE_DIR |
| 97 |
|
|
;; |
| 98 |
|
|
|
| 99 |
|
|
sigterm|condrestart) |
| 100 |
|
|
- action "Sending TERM signal to $SERVICE" /usr/bin/runsvctrl t $SERVICE_DIR |
| 101 |
|
|
+ action "Sending TERM signal to $SERVICE" /usr/bin/sv term $SERVICE_DIR |
| 102 |
|
|
;; |
| 103 |
|
|
|
| 104 |
|
|
status) |
| 105 |
|
|
- /usr/bin/runsvstat $SERVICE_DIR |
| 106 |
|
|
+ /usr/bin/sv status $SERVICE_DIR |
| 107 |
|
|
;; |
| 108 |
|
|
|
| 109 |
|
|
start) |
Parent Directory
| 
Revision Log
| 
Revision Graph
