- lsb fixes: stop never fails

- fix status usage

Changed files:
    bacula-dir.init -> 1.16
    bacula-fd.init -> 1.14
    bacula-sd.init -> 1.15

diff --git a/bacula-dir.init b/bacula-dir.init
index a7517ed6b7ab0f854dced7695587a99bb45979a3..3500efb8c5a01d2fefdb2de5d26d285c2246bb43 100644 (file)
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -37,25 +37,24 @@ stop() {
        # 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=$?
        ;;
 *)

diff --git a/bacula-fd.init b/bacula-fd.init
index 11b947e08547554d01744100e60213457e67525b..824b44b1ffe47e5c27e043f23626222e71fa35d4 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -37,24 +37,23 @@ stop() {
        # 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=$?
        ;;
 *)

diff --git a/bacula-sd.init b/bacula-sd.init
index 23e732dedcad4293d5e9dfe015a6a2648510044b..e1e4f1a2a5bfaadf29df62e59a21cd7a0ed85604 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -37,24 +37,23 @@ stop() {
        # 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=$?
        ;;
 *)