- PLDize; lockfiles

Changed files:
    bacula-fd.init -> 1.8
    bacula-sd.init -> 1.10

diff --git a/bacula-fd.init b/bacula-fd.init
index 144d357d263518a5f8c1fb5f05e3c873f7b01723..9e0980716427a2704c67c0c81c3e3d7a75764798 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -15,17 +15,27 @@ BACULA_FD_GROUP="bacula"
 [ -f /etc/sysconfig/bacula-fd ] && . /etc/sysconfig/bacula-fd
 
 start() {
-       msg_starting "Bacula File"
-       daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
-       RETVAL=$?
-       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
+       # Check if the service is already running?
+       if [ ! -f /var/lock/bacula-fd ]; then
+               msg_starting "Bacula File"
+               daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
+       else
+               msg_already_running "Bacula File"
+       fi
 }
 
 stop() {
-       msg_stopping "Bacula File"
-       killproc /usr/sbin/bacula-fd
-       RETVAL=$?
-       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-fd
+       if [ -f /var/lock/bacula-fd ]; then
+               # Stop daemons.
+               msg_stopping "Bacula File"
+               killproc /usr/sbin/bacula-fd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-fd
+       else
+               msg_not_running "Bacula File"
+       fi
 }
 
 case "$1" in
@@ -45,8 +55,8 @@ status)
        RETVAL=$?
        ;;
 *)
-       echo "Usage: $0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 3
        ;;
 esac
 exit $RETVAL

diff --git a/bacula-sd.init b/bacula-sd.init
index 94a9d56e88c4ff2d4d51f6947910b9879e931970..1ec6b66a686df95f733605025ee9226e2ecb37a3 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -15,17 +15,27 @@ BACULA_SD_GROUP="bacula"
 [ -f /etc/sysconfig/bacula-sd ] && . /etc/sysconfig/bacula-sd
 
 start() {
-       msg_starting "Bacula Storage"
-       daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
-       RETVAL=$?
-       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/bacula-sd ]; then
+               msg_starting "Bacula Storage"
+               daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
+       else
+               msg_already_running "Bacula Storage"
+       fi
 }
 
 stop() {
-       msg_stopping "Bacula Storage"
-       killproc /usr/sbin/bacula-sd
-       RETVAL=$?
-       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-sd
+       if [ -f /var/lock/subsys/bacula-sd ]; then
+               # Stop daemons.
+               msg_stopping "Bacula Storage"
+               killproc /usr/sbin/bacula-sd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-sd
+       else
+               msg_not_running "Bacula Storage"
+       fi
 }
 
 case "$1" in
@@ -45,8 +55,8 @@ status)
        RETVAL=$?
        ;;
 *)
-       echo "Usage: $0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 3
        ;;
 esac
 exit $RETVAL