Blame heartbeat-fedora-chkconfig.patch

Joost Soeterbroek a864aa6
diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
Joost Soeterbroek a864aa6
--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
Joost Soeterbroek a864aa6
+++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
Joost Soeterbroek eca5479
@@ -13,7 +13,7 @@
Joost Soeterbroek eca5479
 #		We don't hate anyone, and like for everyone to use
Joost Soeterbroek eca5479
 #		our software, no matter what OS or distribution you're using.
Joost Soeterbroek eca5479
 #
Joost Soeterbroek eca5479
-# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
Joost Soeterbroek eca5479
+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
Joost Soeterbroek eca5479
 # description: Startup script high-availability services.
Joost Soeterbroek eca5479
 # processname: heartbeat
Joost Soeterbroek eca5479
 # pidfile: @localstatedir@/run/heartbeat.pid
Joost Soeterbroek a864aa6
@@ -391,12 +391,7 @@
Joost Soeterbroek eca5479
 	StartHA
Joost Soeterbroek eca5479
 	RC=$?
Joost Soeterbroek eca5479
 	Echo
Joost Soeterbroek eca5479
-	if
Joost Soeterbroek eca5479
-	  [ $RC -eq 0 ]
Joost Soeterbroek eca5479
-	then
Joost Soeterbroek eca5479
-	  [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR
Joost Soeterbroek eca5479
-	  touch $LOCKDIR/$SUBSYS
Joost Soeterbroek eca5479
-	fi
Joost Soeterbroek eca5479
+	[ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat
Joost Soeterbroek eca5479
 	RunStartStop post-start $RC
Joost Soeterbroek eca5479
 	;;
Joost Soeterbroek eca5479
 
Joost Soeterbroek a864aa6
@@ -413,11 +408,7 @@
Joost Soeterbroek eca5479
 	StopHA
Joost Soeterbroek eca5479
 	RC=$?
Joost Soeterbroek eca5479
 	Echo
Joost Soeterbroek eca5479
-        if
Joost Soeterbroek eca5479
-          [ $RC -eq 0 ]
Joost Soeterbroek eca5479
-        then
Joost Soeterbroek eca5479
-          rm -f $LOCKDIR/$SUBSYS
Joost Soeterbroek eca5479
-        fi
Joost Soeterbroek eca5479
+	[ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat
Joost Soeterbroek eca5479
         RunStartStop post-stop $RC
Joost Soeterbroek eca5479
 	StopLogd
Joost Soeterbroek eca5479
 	;;
Joost Soeterbroek a864aa6
diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
Joost Soeterbroek a864aa6
--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
Joost Soeterbroek a864aa6
+++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
Joost Soeterbroek eca5479
@@ -2,7 +2,7 @@
Joost Soeterbroek eca5479
 #
Joost Soeterbroek eca5479
 # ldirectord  Linux Director Daemon
Joost Soeterbroek eca5479
 #
Joost Soeterbroek eca5479
-# chkconfig: 2345 92 40
Joost Soeterbroek eca5479
+# chkconfig: - 92 40
Joost Soeterbroek eca5479
 # description: Start and stop ldirectord on non-heartbeat systems
Joost Soeterbroek eca5479
 #              Using the config file /etc/ha.d/ldirectord.cf
Joost Soeterbroek eca5479
 #              
Joost Soeterbroek eca5479
@@ -59,9 +59,11 @@
Joost Soeterbroek eca5479
 case "$1" in
Joost Soeterbroek eca5479
   start)
Joost Soeterbroek eca5479
         action "Starting ldirectord" $DAEMON start
Joost Soeterbroek eca5479
+	touch /var/lock/subsys/ldirectord
Joost Soeterbroek eca5479
 	;;
Joost Soeterbroek eca5479
   stop)
Joost Soeterbroek eca5479
         action "Stopping ldirectord" $DAEMON stop
Joost Soeterbroek eca5479
+	rm -f /var/lock/subsys/ldirectord
Joost Soeterbroek eca5479
 	;;
Joost Soeterbroek eca5479
   restart)
Joost Soeterbroek eca5479
         action "Restarting ldirectord" $DAEMON restart