Author: glen                         Date: Wed Jan  3 09:35:55 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- PLDize; lockfiles

---- Files affected:
SOURCES:
   bacula-fd.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/bacula-fd.init
diff -u SOURCES/bacula-fd.init:1.7 SOURCES/bacula-fd.init:1.8
--- SOURCES/bacula-fd.init:1.7  Wed Jan  3 10:33:51 2007
+++ SOURCES/bacula-fd.init      Wed Jan  3 10:35:49 2007
@@ -15,17 +15,27 @@
 [ -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 @@
        RETVAL=$?
        ;;
 *)
-       echo "Usage: $0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|status}"
+       exit 3
        ;;
 esac
 exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bacula-fd.init?r1=1.7&r2=1.8&f=u

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

Reply via email to