packages: resource-agents/ldirectord.init - reviewed, merged with template....

[glen]

Author: glen                         Date: Wed Jan 13 18:45:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reviewed, merged with template.init

---- Files affected:
packages/resource-agents:
   ldirectord.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/resource-agents/ldirectord.init
diff -u packages/resource-agents/ldirectord.init:1.4 packages/resource-agents/ldirectord.init:1.5
--- packages/resource-agents/ldirectord.init:1.4	Sun Jan 28 00:52:47 2007
+++ packages/resource-agents/ldirectord.init	Wed Jan 13 19:45:17 2010
@@ -2,37 +2,52 @@
 #
 # ldirectord  Linux Director Daemon
 #
-# chkconfig:	345 92 40
-# description:	Start and stop ldirectord on non-heartbeat systems
-#		Using the config file /etc/ha.d/ldirectord.cf
+# chkconfig:	345 92 08
+# description: Start and stop ldirectord on non-heartbeat systems \
+#              Using the config file /etc/ha.d/ldirectord.cf \
+#	       Normally ldirectord is started and stopped by heartbeat
+#
 # processname:	ldirectord
 # config:	/etc/ha.d/ldirectord.cf
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down "ldirectord"
+		exit 1
+	fi
+else
+	exit 0
+fi
+
 # Get service config
 [ -f /etc/sysconfig/ldirectord ] && . /etc/sysconfig/ldirectord
 
 start() {
-	if [ ! -f /var/lock/subsys/ldirectord ]; then
-        	msg_starting ldirectord
-		daemon ldirectord start
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldirectord
-	else
-		msg_already_running ldirectord
+	if [ -f /var/lock/subsys/ldirectord ]; then
+		msg_already_running "ldirectord"
+		return
 	fi
+
+	msg_starting "ldirectord"
+	daemon /usr/sbin/ldirectord start
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldirectord
 }
 
 stop() {
-	if [ -f /var/lock/subsys/ldirectord ]; then
-		msg_stopping ldirectord
-		daemon ldirectord stop
-		rm -f /var/lock/subsys/ldirectord
-	else
-		msg_not_running ldirectord
+	if [ ! -f /var/lock/subsys/ldirectord ]; then
+		msg_not_running "ldirectord"
+		return
 	fi
+
+	msg_stopping ldirectord
+	# XXX, do not use "daemon" to "start", try "action" instead?
+	daemon /usr/sbin/ldirectord stop
+	rm -f /var/lock/subsys/ldirectord
 }
 
 RETVAL=0
@@ -47,23 +62,21 @@
   	stop
 	start
 	;;
-  # What is it?
   try-restart)
-	action "Try-Restarting ldirectord" ldirectord try-restart
+	action "Try-Restarting ldirectord" /usr/sbin/ldirectord try-restart
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/ldirectord ]; then
-		msg_reloading ldirectord
-		daemon ldirectord reload
+		msg_reloading "ldirectord"
+		daemon /usr/sbin/ldirectord reload
 		RETVAL=$?
 	else
-		msg_not_running ldirectord
+		msg_not_running "ldirectord"
 		RETVAL=7
 	fi
 	;;
   status)
-  # CHECKME
-	status ldirectord status
+	status /usr/sbin/ldirectord status
 	RETVAL=$?
 	;;
   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/resource-agents/ldirectord.init?r1=1.4&r2=1.5&f=u