summaryrefslogtreecommitdiff
path: root/debian/patches/debian-lsb-logging.patch
blob: fcabafa30f19915d665364a537a05e841f1dbc03 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
From d0c348c211ba812148c0fcd567a7e6b532e28c63 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 2 Apr 2014 18:21:43 +0100
Subject: Convert init scripts to Debian LSB logging

Forwarded: not-needed
Last-Update: 2018-11-03

Patch-Name: debian-lsb-logging.patch
---
 init.d/iprdump.in   | 56 ++++++++-----------------------------------
 init.d/iprinit.in   | 56 ++++++++-----------------------------------
 init.d/iprupdate.in | 58 ++++++++-------------------------------------
 3 files changed, 30 insertions(+), 140 deletions(-)

diff --git a/init.d/iprdump.in b/init.d/iprdump.in
index 6925ead..21b648f 100644
--- a/init.d/iprdump.in
+++ b/init.d/iprdump.in
@@ -23,75 +23,39 @@
 
 IPRDUMP=@sbindir@/iprdump
 test -x $IPRDUMP || exit 5
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 start() {
-    echo -n "Starting ipr dump daemon"
     if [ ! -d /sys/class/scsi_generic ] ; then
         modprobe sg
     fi
     start_daemon $IPRDUMP --daemon
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg " "
-    else
-	log_failure_msg " "
-    fi
-    return $RETVAL
 }
 
 stop() {
-    echo -n "Shutting down ipr dump daemon"
     killproc $IPRDUMP
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg " "
-    else
-	log_failure_msg " "
-    fi
-    return $RETVAL
-}
-
-restart() {
-    $0 stop
-    $0 start
-    return $RETVAL
-}
-
-reload() {
-    echo -n "Reload ipr dump daemon"
-    $0 stop  &&  $0 start
-    return $RETVAL
 }
 
 status() {
-    echo -n "Checking for iprdump daemon: "
-
-    pidofproc $IPRDUMP > /dev/null 2>&1
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg "running"
-    else
-	log_failure_msg "unused"
-    fi
-    return $RETVAL
+    status_of_proc $IPRDUMP iprdump
 }
 
 case "$1" in
     start)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Starting ipr dump daemon" iprdump
 	start
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
     stop)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Shutting down ipr dump daemon" iprdump
 	stop
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
-    restart)
-	restart
-	;;
-    reload|force-reload)
-	reload
+    restart|reload|force-reload)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Restarting ipr dump daemon" iprdump
+	stop && start
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
     status)
 	status
diff --git a/init.d/iprinit.in b/init.d/iprinit.in
index 7d88286..133ada2 100644
--- a/init.d/iprinit.in
+++ b/init.d/iprinit.in
@@ -23,75 +23,39 @@
 
 IPRINIT=@sbindir@/iprinit
 test -x $IPRINIT || exit 5
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 start() {
-    echo -n "Starting ipr initialization daemon"
     if [ ! -d /sys/class/scsi_generic ] ; then
         modprobe sg
     fi
     start_daemon $IPRINIT --daemon
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg " "
-    else
-	log_failure_msg " "
-    fi
-    return $RETVAL
 }
 
 stop() {
-    echo -n "Shutting down ipr initialization daemon"
     killproc $IPRINIT
-    
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg " "
-    else
-	log_failure_msg " "
-    fi
-    return $RETVAL
-}
-
-restart() {
-    $0 stop
-    $0 start
-    return $RETVAL
-}
-
-reload() {
-    echo -n "Reload ipr initialization daemon"
-    $0 stop  &&  $0 start
-    return $RETVAL
 }
 
 status() {
-    echo -n "Checking for ipr initialization daemon: "
-
-    pidofproc $IPRINIT > /dev/null 2>&1
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg "running"
-    else
-	log_failure_msg "unused"
-    fi
-    return $RETVAL
+    status_of_proc $IPRINIT iprinit
 }
 
 case "$1" in
     start)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Starting ipr initialization daemon" iprinit
 	start
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
     stop)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Shutting down ipr initialization daemon" iprinit
 	stop
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
-    restart)
-	restart
-	;;
-    reload|force-reload)
-	reload
+    restart|reload|force-reload)
+	[ "$VERBOSE" = no ] || log_daemon_msg "Restarting ipr initialization daemon" iprinit
+	stop && start
+	[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
     status)
 	status
diff --git a/init.d/iprupdate.in b/init.d/iprupdate.in
index ee043a3..2ec278c 100644
--- a/init.d/iprupdate.in
+++ b/init.d/iprupdate.in
@@ -23,77 +23,39 @@
 
 IPRUPDATE=@sbindir@/iprupdate
 test -x $IPRUPDATE || exit 5
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 start() {
-	echo "Checking ipr microcode levels"
 	if [ ! -d /sys/class/scsi_generic ] ; then
 	    modprobe sg
 	fi
 	start_daemon $IPRUPDATE --daemon
-
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-	    echo -n "Completed ipr microcode updates"
-	    log_success_msg " "
-	else
-	    echo -n "Completed ipr microcode updates"
-	    log_failure_msg " "
-	fi
-        return $RETVAL
 }
 
 stop() {
-    echo -n "Shutting down ipr update daemon"
     killproc $IPRUPDATE
-    
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg " "
-    else
-	log_failure_msg " "
-    fi
-    return $RETVAL
-}
-
-restart() {
-    $0 stop
-    $0 start
-    return $RETVAL
-}
-
-reload() {
-    $0 stop
-    $0 start
-    return $RETVAL
 }
 
 status() {
-    echo -n "Checking for ipr update daemon: "
-
-    pidofproc $IPRUPDATE > /dev/null 2>&1
-
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ]; then
-	log_success_msg "running"
-    else
-	log_failure_msg "unused"
-    fi
-    return $RETVAL
+    status_of_proc $IPRUPDATE iprupdate
 }
 
 case "$1" in
 	start)
+		[ "$VERBOSE" = no ] || log_daemon_msg "Checking ipr microcode levels" iprupdate
 		start
+		[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
 	stop)
+		[ "$VERBOSE" = no ] || log_daemon_msg "Shutting down ipr update daemon" iprupdate
 		stop
+		[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
-	restart)
-		restart
-	;;
-	reload|force-reload)
-		reload
+	restart|reload|force-reload)
+		[ "$VERBOSE" = no ] || log_daemon_msg "Restarting ipr update daemon" iprupdate
+		stop && start
+		[ "$VERBOSE" = no ] || log_end_msg $?
 	;;
 	status)
 		status