packages: multipath-tools/multipathd.init - cosmetics

glen glen at pld-linux.org
Fri Oct 23 12:27:41 CEST 2009


Author: glen                         Date: Fri Oct 23 10:27:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
packages/multipath-tools:
   multipathd.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/multipath-tools/multipathd.init
diff -u packages/multipath-tools/multipathd.init:1.6 packages/multipath-tools/multipathd.init:1.7
--- packages/multipath-tools/multipathd.init:1.6	Thu Jun 11 23:25:58 2009
+++ packages/multipath-tools/multipathd.init	Fri Oct 23 12:27:36 2009
@@ -11,30 +11,33 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+# Get service config - may override defaults
 [ -f /etc/sysconfig/multipathd ] && . /etc/sysconfig/multipathd
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/multipathd ]; then
-		msg_starting "multipath daemon"
-		modprobe dm-multipath
-		daemon /sbin/multipathd
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/multipathd
-	else
+	if [ -f /var/lock/subsys/multipathd ]; then
 		msg_already_running "multipath daemon"
+		return
 	fi
+
+	msg_starting "multipath daemon"
+	modprobe dm-multipath
+	daemon /sbin/multipathd
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/multipathd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/multipathd ]; then
-		# Stop daemons.
-		msg_stopping "multipath daemon"
-		killproc --pidfile multipathd.pid multipathd -TERM
-		rm -f /var/lock/subsys/multipathd
-	else
+	if [ ! -f /var/lock/subsys/multipathd ]; then
 		msg_not_running "multipath daemon"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "multipath daemon"
+	killproc --pidfile multipathd.pid multipathd -TERM
+	rm -f /var/lock/subsys/multipathd
 }
 
 condrestart() {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/multipath-tools/multipathd.init?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list