Author: glen                         Date: Thu Oct 14 19:48:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add try-restart, force-reload

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

---- Diffs:

================================================================
Index: packages/bacula/bacula-dir.init
diff -u packages/bacula/bacula-dir.init:1.16 
packages/bacula/bacula-dir.init:1.17
--- packages/bacula/bacula-dir.init:1.16        Thu Oct 14 21:45:42 2010
+++ packages/bacula/bacula-dir.init     Thu Oct 14 21:47:59 2010
@@ -40,6 +40,17 @@
        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 @@
        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

================================================================
Index: packages/bacula/bacula-fd.init
diff -u packages/bacula/bacula-fd.init:1.14 packages/bacula/bacula-fd.init:1.15
--- packages/bacula/bacula-fd.init:1.14 Thu Oct 14 21:45:42 2010
+++ packages/bacula/bacula-fd.init      Thu Oct 14 21:47:59 2010
@@ -40,6 +40,17 @@
        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 @@
        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

================================================================
Index: packages/bacula/bacula-sd.init
diff -u packages/bacula/bacula-sd.init:1.15 packages/bacula/bacula-sd.init:1.16
--- packages/bacula/bacula-sd.init:1.15 Thu Oct 14 21:45:42 2010
+++ packages/bacula/bacula-sd.init      Thu Oct 14 21:47:59 2010
@@ -40,6 +40,17 @@
        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 @@
        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
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to