SOURCES: bacula-dir.init - lockfiles

[glen]

Author: glen                         Date: Wed Jan  3 09:30:49 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- lockfiles

---- Files affected:
SOURCES:
   bacula-dir.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/bacula-dir.init
diff -u SOURCES/bacula-dir.init:1.8 SOURCES/bacula-dir.init:1.9
--- SOURCES/bacula-dir.init:1.8	Wed Jan  3 10:29:18 2007
+++ SOURCES/bacula-dir.init	Wed Jan  3 10:30:44 2007
@@ -11,17 +11,27 @@
 . /etc/rc.d/init.d/functions
 
 start() {
-	msg_starting "Bacula Director"
-	daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
+	# Check if the service is already running?
+	if [ ! -f /var/lock/subsys/"Bacula Director" ]; then
+		msg_starting "Bacula Director"
+		daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
+	else
+		msg_already_running "Bacula Director"
+	fi
 }
 
 stop() {
-	msg_stopping "Bacula Director"
-	killproc /usr/sbin/bacula-dir
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-dir
+	if [ -f /var/lock/subsys/"Bacula Director" ]; then
+		# Stop daemons.
+		msg_stopping "Bacula Director"
+		killproc /usr/sbin/bacula-dir
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-dir
+	else
+		msg_not_running "Bacula Director"
+	fi
 }
 
 RETVAL=0
================================================================

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