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 davidlee from
([email protected])
2. Linux-HA CVS: heartbeat by davidlee from
([email protected])
3. Linux-HA CVS: linux-ha by davidlee from
([email protected])
4. Linux-HA CVS: heartbeat by davidlee from
([email protected])
5. Linux-HA CVS: heartbeat by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Dec 2005 07:41:08 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
two portability fixes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- BasicSanityCheck.in 7 Dec 2005 05:41:33 -0000 1.89
+++ BasicSanityCheck.in 20 Dec 2005 14:41:07 -0000 1.90
@@ -46,6 +46,7 @@
SNMPAGENTTEST=$HBLIB/SNMPAgentSanityCheck
BASE64_MD5_TEST=$HBLIB/base64_md5_test
MALLOC_CHECK_=2; export MALLOC_CHECK_
[EMAIL PROTECTED]@
#
DEFAULTINTERFACE=eth0 # But we really guess it...
#
@@ -67,7 +68,8 @@
# $RANDOM is not strictly necessary, but nice to have...
#
if
- F=`mktemp /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
+ test "x$MKTEMP" != "x" \
+ && F=`$MKTEMP /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
then
echo $F
else
@@ -131,7 +133,7 @@
GenerateAuthKeys() {
if
- [ "$AuthTry" == "" ]
+ [ "$AuthTry" = "" ]
then
AuthTry=1
else
------------------------------
Message: 2
Date: Tue, 20 Dec 2005 07:52:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
shellfuncs.in
Log Message:
portability fix
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/shellfuncs.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- shellfuncs.in 24 Oct 2005 14:49:45 -0000 1.20
+++ shellfuncs.in 20 Dec 2005 14:52:59 -0000 1.21
@@ -28,6 +28,8 @@
export HA_DEBUGLOG HA_LOGFILE HA_LOGFACILITY
export HA_DATEFMT HA_RESOURCEDIR HA_DOCDIR
[EMAIL PROTECTED]@
+
# A suitable echo command
Echo() {
@ECHO_CMD@ "$@"
@@ -221,7 +223,8 @@
# $RANDOM is not strictly necessary, but nice to have...
#
if
- F=`mktemp /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
+ test "x$MKTEMP" != "x" \
+ && F=`$MKTEMP /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
then
echo $F
else
------------------------------
Message: 3
Date: Tue, 20 Dec 2005 11:08:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Portability of '-O' of 'test' (binary vs. sh-builtin)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -3 -r1.479 -r1.480
--- configure.in 12 Dec 2005 21:57:41 -0000 1.479
+++ configure.in 20 Dec 2005 18:08:24 -0000 1.480
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.479 $) dnl cvs revision
+AC_REVISION($Revision: 1.480 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -389,6 +389,9 @@
AC_SUBST(LN)
AC_SUBST(MD5)
+dnl The "test" program can be different from the "sh" builtin.
+AC_PATH_PROGS(TEST, test)
+
AC_PATH_PROGS(DRBDADM, drbdadm)
AC_PATH_PROGS(DRBDSETUP, drbdsetup)
AC_PATH_PROGS(PKGCONFIG, pkg-config)
------------------------------
Message: 4
Date: Tue, 20 Dec 2005 11:08:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
Portability of '-O' of 'test' (binary vs. sh-builtin)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- BasicSanityCheck.in 20 Dec 2005 14:41:07 -0000 1.90
+++ BasicSanityCheck.in 20 Dec 2005 18:08:24 -0000 1.91
@@ -47,6 +47,7 @@
BASE64_MD5_TEST=$HBLIB/base64_md5_test
MALLOC_CHECK_=2; export MALLOC_CHECK_
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
#
DEFAULTINTERFACE=eth0 # But we really guess it...
#
@@ -79,7 +80,7 @@
rm -f "$F"; touch "$F"
# Try again if we don't own it, or it's a symlink
# Or somehow not a regular file...
- test ! -O "$F" -o -L "$F" -o ! -f "$F"
+ $TESTPROG ! -O "$F" -o -L "$F" -o ! -f "$F"
do
: Try again...
done
------------------------------
Message: 5
Date: Tue, 20 Dec 2005 11:08:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
shellfuncs.in
Log Message:
Portability of '-O' of 'test' (binary vs. sh-builtin)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/shellfuncs.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- shellfuncs.in 20 Dec 2005 14:52:59 -0000 1.21
+++ shellfuncs.in 20 Dec 2005 18:08:24 -0000 1.22
@@ -29,6 +29,7 @@
export HA_DATEFMT HA_RESOURCEDIR HA_DOCDIR
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
# A suitable echo command
Echo() {
@@ -234,7 +235,7 @@
rm -f "$F"; touch "$F"
# Try again if we don't own it, or it's a symlink
# Or somehow not a regular file...
- test ! -O "$F" -o -L "$F" -o ! -f "$F"
+ $TESTPROG ! -O "$F" -o -L "$F" -o ! -f "$F"
do
: Try again...
done
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 47
********************************************
