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 2008-03-26 14:32:35.000000000 -0600 |
3 |
+++ mezzanine_patched_e-smith-runit-1.0.0/root/etc/rc.d/init.d/daemontools 2008-03-26 14:32:16.000000000 -0600 |
4 |
@@ -10,8 +10,8 @@ |
5 |
|
6 |
# Determine the service name and its service directory from $0 |
7 |
|
8 |
-SERVICE=$(/bin/basename $0 | sed -e 's/^[SK][0-9][0-9]*//') |
9 |
-SERVICE_DIR=/service/$SERVICE |
10 |
+prog=$(/bin/basename $0 | sed -e 's/^[SK][0-9][0-9]*//') |
11 |
+SERVICE_DIR=/service/$prog |
12 |
|
13 |
########################################################################### |
14 |
|
15 |
@@ -24,28 +24,28 @@ |
16 |
|
17 |
start() |
18 |
{ |
19 |
- /bin/echo -n "Starting $SERVICE:" |
20 |
+ /bin/echo -n $"Starting $prog:" |
21 |
dirs=$1 |
22 |
if [ -d $1/log ]; then |
23 |
dirs="$1/log $1" |
24 |
fi |
25 |
/usr/bin/sv u $dirs > /dev/null |
26 |
if [ $? -ne 0 ]; then |
27 |
- failure "Starting $SERVICE" |
28 |
+ failure "Starting $prog" |
29 |
else |
30 |
- success "Starting $SERVICE" |
31 |
+ success "Starting $prog" |
32 |
fi |
33 |
/bin/echo |
34 |
} |
35 |
|
36 |
stop() |
37 |
{ |
38 |
- /bin/echo -n "Stopping $SERVICE:" |
39 |
+ /bin/echo -n $"Stopping $prog:" |
40 |
/usr/bin/sv stop $1 > /dev/null |
41 |
if [ $? -ne 0 ]; then |
42 |
- failure "Stopping $SERVICE" |
43 |
+ failure "Stopping $prog" |
44 |
else |
45 |
- success "Stopping $SERVICE" |
46 |
+ success "Stopping $prog" |
47 |
fi |
48 |
/bin/echo |
49 |
} |
50 |
@@ -55,7 +55,7 @@ |
51 |
# uninstall of the service in question. |
52 |
svdisable() |
53 |
{ |
54 |
- /bin/echo -n "Disabling $SERVICE:" |
55 |
+ /bin/echo -n $"Disabling $prog:" |
56 |
stop $1 |
57 |
cd $1 && rm -f $1 |
58 |
dirs=. |
59 |
@@ -65,9 +65,9 @@ |
60 |
/usr/bin/sv d $dirs |
61 |
/usr/bin/sv x $dirs |
62 |
if [ $? -ne 0 ]; then |
63 |
- failure "Disabling $SERVICE" |
64 |
+ failure "Disabling $prog" |
65 |
else |
66 |
- success "Disabling $SERVICE" |
67 |
+ success "Disabling $prog" |
68 |
fi |
69 |
/bin/echo |
70 |
} |
71 |
@@ -75,44 +75,44 @@ |
72 |
case $1 in |
73 |
|
74 |
restart) |
75 |
- action "Restarting $SERVICE" /usr/bin/sv t $SERVICE_DIR |
76 |
+ action "Restarting $prog" /usr/bin/sv t $SERVICE_DIR |
77 |
/usr/bin/sv u $SERVICE_DIR |
78 |
;; |
79 |
|
80 |
sigalrm) |
81 |
- action "Sending ALRM signal to $SERVICE" /usr/bin/sv a $SERVICE_DIR |
82 |
+ action "Sending ALRM signal to $prog" /usr/bin/sv a $SERVICE_DIR |
83 |
;; |
84 |
|
85 |
sigcont) |
86 |
- action "Sending CONT signal to $SERVICE" /usr/bin/sv c $SERVICE_DIR |
87 |
+ action "Sending CONT signal to $prog" /usr/bin/sv c $SERVICE_DIR |
88 |
;; |
89 |
|
90 |
sighup) |
91 |
- action "Sending HUP signal to $SERVICE" /usr/bin/sv h $SERVICE_DIR |
92 |
+ action "Sending HUP signal to $prog" /usr/bin/sv h $SERVICE_DIR |
93 |
;; |
94 |
|
95 |
sigusr1) |
96 |
- action "Sending USR1 signal to $SERVICE" /usr/bin/sv 1 $SERVICE_DIR |
97 |
+ action "Sending USR1 signal to $prog" /usr/bin/sv 1 $SERVICE_DIR |
98 |
;; |
99 |
|
100 |
sigusr2) |
101 |
- action "Sending USR2 signal to $SERVICE" /usr/bin/sv 2 $SERVICE_DIR |
102 |
+ action "Sending USR2 signal to $prog" /usr/bin/sv 2 $SERVICE_DIR |
103 |
;; |
104 |
|
105 |
sigint) |
106 |
- action "Sending INT signal to $SERVICE" /usr/bin/sv i $SERVICE_DIR |
107 |
+ action "Sending INT signal to $prog" /usr/bin/sv i $SERVICE_DIR |
108 |
;; |
109 |
|
110 |
sigkill) |
111 |
- action "Sending KILL signal to $SERVICE" /usr/bin/sv k $SERVICE_DIR |
112 |
+ action "Sending KILL signal to $prog" /usr/bin/sv k $SERVICE_DIR |
113 |
;; |
114 |
|
115 |
sigstop) |
116 |
- action "Sending STOP signal to $SERVICE" /usr/bin/sv p $SERVICE_DIR |
117 |
+ action "Sending STOP signal to $prog" /usr/bin/sv p $SERVICE_DIR |
118 |
;; |
119 |
|
120 |
sigterm|condrestart) |
121 |
- action "Sending TERM signal to $SERVICE" /usr/bin/sv t $SERVICE_DIR |
122 |
+ action "Sending TERM signal to $prog" /usr/bin/sv t $SERVICE_DIR |
123 |
;; |
124 |
|
125 |
status) |
126 |
@@ -132,7 +132,7 @@ |
127 |
;; |
128 |
|
129 |
*) |
130 |
- echo "usage: $0 {start|stop|restart|status|sigalrm|sigcont|sighup|sigint|sigkill|sigstop|sigterm|condrestart|sigusr1|sigusr2|svdisable}" |
131 |
+ echo $"usage: $0 {start|stop|restart|status|sigalrm|sigcont|sighup|sigint|sigkill|sigstop|sigterm|condrestart|sigusr1|sigusr2|svdisable}" |
132 |
;; |
133 |
|
134 |
esac |