- add try-restart, force-reload

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

diff --git a/bacula-dir.init b/bacula-dir.init
index 3500efb8c5a01d2fefdb2de5d26d285c2246bb43..16e0654099e63bb800a2ac03ba56107511837fa2 100644 (file)
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -40,6 +40,17 @@ stop() {
        rm -f /var/lock/subsys/bacula-dir
 }
 
+condrestart() {
+       if [ ! -f /var/lock/subsys/bacula-dir ]; then
+               msg_not_running  "Bacula Director"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
 RETVAL=0
 case "$1" in
   start)
@@ -53,12 +64,18 @@ case "$1" in
        sleep 5
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status bacula-dir
        RETVAL=$?
        ;;
 *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac

diff --git a/bacula-fd.init b/bacula-fd.init
index 824b44b1ffe47e5c27e043f23626222e71fa35d4..7848300c6c12428b4c5c79857209bc306d7f6f3a 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -40,6 +40,17 @@ stop() {
        rm -f /var/lock/subsys/bacula-fd
 }
 
+condrestart() {
+       if [ ! -f /var/lock/subsys/bacula-fd ]; then
+               msg_not_running "Bacula File"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
 case "$1" in
   start)
        start
@@ -52,12 +63,18 @@ case "$1" in
        sleep 5
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status bacula-fd
        RETVAL=$?
        ;;
 *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac

diff --git a/bacula-sd.init b/bacula-sd.init
index e1e4f1a2a5bfaadf29df62e59a21cd7a0ed85604..52616b6d9bf22609da682b0e24ffd6de91f99543 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -40,6 +40,17 @@ stop() {
        rm -f /var/lock/subsys/bacula-sd
 }
 
+condrestart() {
+       if [ ! -f /var/lock/subsys/bacula-sd ]; then
+               msg_not_running "Bacula Storage"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
 case "$1" in
   start)
        start
@@ -52,12 +63,18 @@ case "$1" in
        sleep 5
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status bacula-sd
        RETVAL=$?
        ;;
 *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
        ;;
 esac