packages: bacula/bacula-dir.init, bacula/bacula-fd.init, bacula/bacula-sd.i...

[glen]

Author: glen                         Date: Thu Oct 14 19:45:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- lsb fixes: stop never fails
- fix status usage

---- Files affected:
packages/bacula:
   bacula-dir.init (1.15 -> 1.16) , bacula-fd.init (1.13 -> 1.14) , bacula-sd.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/bacula/bacula-dir.init
diff -u packages/bacula/bacula-dir.init:1.15 packages/bacula/bacula-dir.init:1.16
--- packages/bacula/bacula-dir.init:1.15	Thu Oct 14 21:43:10 2010
+++ packages/bacula/bacula-dir.init	Thu Oct 14 21:45:42 2010
@@ -37,25 +37,24 @@
 	# Stop daemons.
 	msg_stopping "Bacula Director"
 	killproc /usr/sbin/bacula-dir
-	RETVAL=$?
 	rm -f /var/lock/subsys/bacula-dir
 }
 
 RETVAL=0
 case "$1" in
-start)
+  start)
 	start
 	;;
-stop)
+  stop)
 	stop
 	;;
-restart)
+  restart)
 	stop
    	sleep 5
 	start
 	;;
-status)
-	status /usr/sbin/bacula-dir
+  status)
+	status bacula-dir
 	RETVAL=$?
 	;;
 *)

================================================================
Index: packages/bacula/bacula-fd.init
diff -u packages/bacula/bacula-fd.init:1.13 packages/bacula/bacula-fd.init:1.14
--- packages/bacula/bacula-fd.init:1.13	Thu Oct 14 21:43:10 2010
+++ packages/bacula/bacula-fd.init	Thu Oct 14 21:45:42 2010
@@ -37,24 +37,23 @@
 	# Stop daemons.
 	msg_stopping "Bacula File"
 	killproc /usr/sbin/bacula-fd
-	RETVAL=$?
 	rm -f /var/lock/subsys/bacula-fd
 }
 
 case "$1" in
-start)
+  start)
 	start
 	;;
-stop)
+  stop)
 	stop
 	;;
-restart)
+  restart)
 	stop
    	sleep 5
 	start
 	;;
-status)
-	status /usr/sbin/bacula-fd
+  status)
+	status bacula-fd
 	RETVAL=$?
 	;;
 *)

================================================================
Index: packages/bacula/bacula-sd.init
diff -u packages/bacula/bacula-sd.init:1.14 packages/bacula/bacula-sd.init:1.15
--- packages/bacula/bacula-sd.init:1.14	Thu Oct 14 21:43:10 2010
+++ packages/bacula/bacula-sd.init	Thu Oct 14 21:45:42 2010
@@ -37,24 +37,23 @@
 	# Stop daemons.
 	msg_stopping "Bacula Storage"
 	killproc /usr/sbin/bacula-sd
-	RETVAL=$?
 	rm -f /var/lock/subsys/bacula-sd
 }
 
 case "$1" in
-start)
+  start)
 	start
 	;;
-stop)
+  stop)
 	stop
 	;;
-restart)
+  restart)
 	stop
    	sleep 5
 	start
 	;;
-status)
-	status /usr/sbin/bacula-sd
+  status)
+	status bacula-sd
 	RETVAL=$?
 	;;
 *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-dir.init?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-fd.init?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-sd.init?r1=1.14&r2=1.15&f=u