SOURCES: bacula-dir.init - use functions

[glen]

Author: glen                         Date: Wed Jan  3 09:28:51 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   bacula-dir.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/bacula-dir.init
diff -u SOURCES/bacula-dir.init:1.6 SOURCES/bacula-dir.init:1.7
--- SOURCES/bacula-dir.init:1.6	Wed Jan  3 10:27:47 2007
+++ SOURCES/bacula-dir.init	Wed Jan  3 10:28:46 2007
@@ -10,24 +10,32 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-RETVAL=0
-case "$1" in
-start)
+start() {
 	msg_starting "Bacula Director"
 	daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
-	;;
-stop)
+}
+
+stop() {
 	msg_stopping "Bacula Director"
 	killproc /usr/sbin/bacula-dir
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-dir
+}
+
+RETVAL=0
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
 	;;
 restart)
-	$0 stop && sleep 5
-	$0 start
-	RETVAL=$?
+	stop
+   	sleep 5
+	start
 	;;
 status)
 	status /usr/sbin/bacula-dir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bacula-dir.init?r1=1.6&r2=1.7&f=u