Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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 horms from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: debian by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 02:59:35 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/resource.d
Modified Files:
Tag: STABLE_1_2
IPaddr.in
Log Message:
Resource agent: Make sure that SYSTYPE is quoted
This is probably a bit paranoid, but really ought to be quoted
when used in if-then-else claueses. I'm not sure about case, but
there was one quoted instance, so I made them all quoted. I can make
the reverse change if that is prefered.
This is a backport of a similar patch for the HEAD branch
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/resource.d/Attic/IPaddr.in,v
retrieving revision 1.52.2.11
retrieving revision 1.52.2.12
diff -u -3 -r1.52.2.11 -r1.52.2.12
--- IPaddr.in 8 Sep 2005 16:49:25 -0000 1.52.2.11
+++ IPaddr.in 15 Aug 2006 08:59:35 -0000 1.52.2.12
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: IPaddr.in,v 1.52.2.11 2005/09/08 16:49:25 alan Exp $
+# $Id: IPaddr.in,v 1.52.2.12 2006/08/15 08:59:35 horms Exp $
#
# This script manages IP alias IP addresses
#
@@ -103,7 +103,7 @@
done
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
$IFCONFIG | grep "$ipaddr" -B4 | grep "UP," | cut -d ":" -f 1
return 0;;
@@ -127,7 +127,7 @@
# is an aliased interface name (e.g., "eth0:0").
#
find_interface() {
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
IF=`find_interface_solaris $BASEIP`
;;
@@ -152,7 +152,7 @@
# ipaddr="$1"
# iface="$2"
#
-# case $SYSTYPE in
+# case "$SYSTYPE" in
# SunOS)
# dev_intf="-interface"
# ;;
@@ -173,7 +173,7 @@
delete_route () {
ipaddr="$1"
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
CMD=""
;;
@@ -196,7 +196,7 @@
ipaddr="$1"
ifname="$2"
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
if [ "$SYSVERSION" -ge 8 ] ; then
CMD="$IFCONFIG $ifname unplumb"
@@ -230,7 +230,7 @@
# This will remove the "extra" interface Data
# leaving us with just ethx
#
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
IFEXTRA=""
;;
@@ -239,7 +239,7 @@
;;
esac
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
if [ "$SYSVERSION" -ge 8 ] ; then
$IFCONFIG $iface plumb
@@ -331,7 +331,7 @@
BASEIP=`echo $1 | sed s'%/.*%%'`
SENDARPPIDFILE="$SENDARPPIDDIR/send_arp-$BASEIP"
IF=`find_interface $BASEIP`
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
;;
Linux|SunOS)
@@ -348,7 +348,7 @@
rm -f "$SENDARPPIDFILE"
fi
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
if $IFCONFIG $IFCONFIG_A_OPT | \
grep "inet.*[: ]$BASEIP " >/dev/null 2>&1; then
@@ -386,7 +386,7 @@
delete_interface "$BASEIP" "$IF"
rc=$?
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD) ;;
Linux|SunOS)
restore_loopback "$BASEIP"
@@ -444,7 +444,7 @@
NICBASE="$VLDIR/$nicname"
touch "$NICBASE"
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
IFLIST=`$IFCONFIG $IFCONFIG_A_OPT | \
grep "^$nicname:[0-9]" | sed 's%: .*%%'`
@@ -457,7 +457,7 @@
IFLIST=" `echo $IFLIST` "
- case $SYSTYPE in
+ case "$SYSTYPE" in
SunOS)
j=1
;;
@@ -474,7 +474,7 @@
;;
esac
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
echo $nicname;
return 0;;
@@ -519,7 +519,7 @@
BASEIP=`echo $1 | sed s'%/.*%%'`
SENDARPPIDFILE="$SENDARPPIDDIR/send_arp-$BASEIP"
- case $SYSTYPE in
+ case "$SYSTYPE" in
Linux|SunOS)
CURRENTIF=`find_interface "$BASEIP"`
case $CURRENTIF in
@@ -586,7 +586,7 @@
BASEIP=`echo $1 | sed -e s'%/.*%%'`
IF=`find_interface $BASEIP`
- case $SYSTYPE in
+ case "$SYSTYPE" in
*BSD)
if
$IFCONFIG $IFCONFIG_A_OPT | grep "inet.*[: ]$BASEIP "
>/dev/null 2>&1
@@ -629,7 +629,7 @@
ip_monitor() {
BASEIP=`echo $1 | sed s'%/.*%%'`
TIMEOUT=1 # seconds
- case $SYSTYPE in
+ case "$SYSTYPE" in
Linux)
# -c count -t timetolive -q(uiet) -n(umeric) -W timeout
PINGARGS="-c 1 -q -n $BASEIP"
@@ -661,7 +661,7 @@
usage() {
echo $USAGE >&2
- echo "$Id: IPaddr.in,v 1.52.2.11 2005/09/08 16:49:25 alan Exp $"
+ echo "$Id: IPaddr.in,v 1.52.2.12 2006/08/15 08:59:35 horms Exp $"
}
#
@@ -708,6 +708,18 @@
#
#
# $Log: IPaddr.in,v $
+# Revision 1.52.2.12 2006/08/15 08:59:35 horms
+# Resource agent: Make sure that SYSTYPE is quoted
+#
+# This is probably a bit paranoid, but really ought to be quoted
+# when used in if-then-else claueses. I'm not sure about case, but
+# there was one quoted instance, so I made them all quoted. I can make
+# the reverse change if that is prefered.
+#
+# This is a backport of a similar patch for the HEAD branch
+#
+# Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
+#
# Revision 1.52.2.11 2005/09/08 16:49:25 alan
# Undid an erroneous fix by Sun Jiang Dong.
# It sounds good, but it breaks CTS.
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 03:00:37 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
ldirectord: tabs not spaces for indentation
Backport of 1.183 (ldirectord.in 1.39)
Cc: Ryan Williams <[EMAIL PROTECTED]>
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.84
retrieving revision 1.77.2.85
diff -u -3 -r1.77.2.84 -r1.77.2.85
--- ldirectord 15 Aug 2006 08:55:37 -0000 1.77.2.84
+++ ldirectord 15 Aug 2006 09:00:37 -0000 1.77.2.85
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.84 2006/08/15 08:55:37 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.85 2006/08/15 09:00:37 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -2716,7 +2716,7 @@
service_set($v,$r,"up");
return 0;
}
- }
+ }
service_set($v,$r,"down");
return 1;
@@ -2873,7 +2873,7 @@
$is_quiescent = "quiescent";
}
- $or=$ov->{"real"}->{$rservice};
+ $or=$ov->{"real"}->{$rservice};
# If a virtual service is a IP/port service (not fwmark)
# and a real-servers uses a forwarding mechanism other than masq
@@ -2904,7 +2904,7 @@
}
}
- if((!defined($or) and !defined($is_quiescent)) or
+ if((!defined($or) and !defined($is_quiescent)) or
(defined($is_quiescent) and defined($or) and
$or->{"weight"} eq 0 and
get_forward_flag($or->{"forward"}) eq $rforw)){
@@ -3506,7 +3506,7 @@
my $status;
- &ld_log("Running exec(@args)") if $DEBUG>2;
+ &ld_log("Running exec(@args)") if $DEBUG>2;
$status = exec(@args);
if($status != 0) {
&ld_log("exec(@args) failed");
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 03:01:17 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
control
Log Message:
debian: Add build dependancy on iptables
This is needed to supply the correct path to iptables for the portblock
resource
Debian Bug: #380180
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.33
retrieving revision 1.17.2.34
diff -u -3 -r1.17.2.33 -r1.17.2.34
--- control 15 Aug 2006 08:56:52 -0000 1.17.2.33
+++ control 15 Aug 2006 09:01:17 -0000 1.17.2.34
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Simon Horman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev, openssh-client
+Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev, openssh-client, iptables
Standards-Version: 3.7.2
Package: ldirectord
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 61
********************************************
