[Devil-linux-commit] build/scripts/scripts heartbeat,1.5,1.6

[Björn R. <br...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20056

Modified Files:
	heartbeat 
Log Message:
- further updates


Index: heartbeat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/heartbeat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- heartbeat	14 May 2008 13:59:39 -0000	1.5
+++ heartbeat	14 May 2008 14:10:50 -0000	1.6
@@ -117,7 +117,7 @@
 
 DISTFUNCS=/etc/rc.d/init.d/functions
 SUBSYS=heartbeat
-INSMOD=/sbin/insmod
+MODPROBE=/sbin/modprobe
 US=`uname -n`
 
 # Set this to a 1 if you want to automatically load kernel modules
@@ -205,7 +205,7 @@
 
 init_watchdog() {
   if
-    [  -f /proc/devices -a  -x $INSMOD ]
+    [  -f /proc/devices -a  -x $MODPROBE ]
   then
     init_watchdog_linux
   fi
@@ -239,7 +239,7 @@
   then
     : Watchdog requested by $CONFIG file
   #
-  #	We try and insmod the module if there's no dev or the dev exists
+  #	We try and modprobe the module if there's no dev or the dev exists
   #	and points to the softdog major device.
   #
     if
@@ -263,7 +263,7 @@
       then
         : softdog already loaded
       else
-        $INSMOD softdog nowayout=0 >/dev/null 2>&1
+        $MODPROBE softdog nowayout=0 >/dev/null 2>&1
       fi;;
   esac
   if
@@ -302,7 +302,7 @@
   then
     : OK
   else
-    $HA_BIN/ResourceManager verifyallidle
+    $HA_NOARCHBIN/ResourceManager verifyallidle
   fi
   if
     [ $USE_MODULES = 1 ]
@@ -364,8 +364,8 @@
 }
 
 StandbyHA() {
-  auto_failback=`ha_parameter auto_failback | tr 'A-Z' 'a-z'`
-  nice_failback=`ha_parameter nice_failback | tr 'A-Z' 'a-z'`
+  auto_failback=`ha_parameter auto_failback | tr '[A-Z]' '[a-z]'`
+  nice_failback=`ha_parameter nice_failback | tr '[A-Z]' '[a-z]'`
 
   case "$auto_failback" in
     *legacy*)	echo "auto_failback is set to legacy.  Cannot enter standby."
@@ -386,7 +386,7 @@
   then
     EchoNoNl "Attempting to enter standby mode"
     if
-      $HA_BIN/hb_standby
+      $HA_NOARCHBIN/hb_standby
     then
       # It's impossible to tell how long this will take.
       echo_success