Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: heartbeat by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 14 Apr 2006 13:25:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/init.d
Modified Files:
heartbeat.in
Log Message:
Bug 1200: heartbeat init script should use modprobe instead of insmod
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/init.d/heartbeat.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- heartbeat.in 10 Sep 2005 21:46:23 -0000 1.41
+++ heartbeat.in 14 Apr 2006 19:25:33 -0000 1.42
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: heartbeat.in,v 1.41 2005/09/10 21:46:23 gshi Exp $
+# $Id: heartbeat.in,v 1.42 2006/04/14 19:25:33 alan Exp $
#
# heartbeat Start high-availability services
#
@@ -80,7 +80,7 @@
DISTFUNCS=/etc/rc.d/init.d/functions
PROC_HA=$HA_BIN/ha.o
SUBSYS=heartbeat
-INSMOD=/sbin/insmod
+MODPROBE=/sbin/modprobe
US=`uname -n`
# Set this to a 1 if you want to automatically load kernel modules
@@ -168,7 +168,7 @@
init_watchdog() {
if
- [ -f /proc/devices -a -x $INSMOD ]
+ [ -f /proc/devices -a -x $MODPROBE ]
then
init_watchdog_linux
fi
@@ -202,7 +202,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
@@ -226,7 +226,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
@@ -450,6 +450,9 @@
#
#
# $Log: heartbeat.in,v $
+# Revision 1.42 2006/04/14 19:25:33 alan
+# Bug 1200: heartbeat init script should use modprobe instead of insmod
+#
# Revision 1.41 2005/09/10 21:46:23 gshi
# fixed a typo in translating upper case to lower case
#
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 88
********************************************
