diff -Nur heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.3/heartbeat/init.d/heartbeat.in
--- heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200
+++ heartbeat-2.0.3/heartbeat/init.d/heartbeat.in 2006-02-28 22:07:00.000000000 +0100
@@ -13,7 +13,7 @@
# We don't hate anyone, and like for everyone to use
# our software, no matter what OS or distribution you're using.
#
-# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
# description: Startup script high-availability services.
# processname: heartbeat
# pidfile: @localstatedir@/run/heartbeat.pid
@@ -51,18 +51,6 @@
RUNDIR=@localstatedir@/run
if
- [ -r /etc/SuSE-release ]
-then
- # rc.status is new since SuSE 7.0
- [ -r /etc/rc.status ] && . /etc/rc.status
- [ -r /etc/rc.config ] && . /etc/rc.config
-
- # Determine the base and follow a runlevel link name.
- base=${0##*/}
- link=${base#*[SK][0-9][0-9]}
-
-fi
-if
[ -z "$rc_done" ]
then
rc_done="Done."
@@ -391,12 +379,7 @@
StartHA
RC=$?
Echo
- if
- [ $RC -eq 0 ]
- then
- [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR
- touch $LOCKDIR/$SUBSYS
- fi
+ [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat
RunStartStop post-start $RC
;;
@@ -413,11 +396,7 @@
StopHA
RC=$?
Echo
- if
- [ $RC -eq 0 ]
- then
- rm -f $LOCKDIR/$SUBSYS
- fi
+ [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat
RunStartStop post-stop $RC
StopLogd
;;
diff -Nur heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord heartbeat-2.0.3/ldirectord/init.d/ldirectord
--- heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200
+++ heartbeat-2.0.3/ldirectord/init.d/ldirectord 2006-02-25 22:57:16.000000000 +0100
@@ -2,7 +2,7 @@
#
# ldirectord Linux Director Daemon
#
-# chkconfig: 2345 92 40
+# chkconfig: - 92 40
# description: Start and stop ldirectord on non-heartbeat systems
# Using the config file /etc/ha.d/ldirectord.cf
#
@@ -59,9 +59,11 @@
case "$1" in
start)
action "Starting ldirectord" $DAEMON start
+ touch /var/lock/subsys/ldirectord
;;
stop)
action "Stopping ldirectord" $DAEMON stop
+ rm -f /var/lock/subsys/ldirectord
;;
restart)
action "Restarting ldirectord" $DAEMON restart