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: crm by andrew from
([email protected])
2. Linux-HA CVS: resources by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: resources by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 16 Dec 2005 23:05:00 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
Makefile.am
Log Message:
Set permissions to the same as the .spec file
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 17 Aug 2005 08:44:57 -0000 1.10
+++ Makefile.am 17 Dec 2005 06:04:59 -0000 1.11
@@ -29,8 +29,8 @@
$(mkinstalldirs) $(DESTDIR)/$(crmdir)
-chown $(HA_CCMUSER) $(DESTDIR)/$(crmdir)
-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crmdir)
- -chmod g+w $(DESTDIR)/$(crmdir)
+ -chmod 750 $(DESTDIR)/$(crmdir)
-mkdir $(DESTDIR)/$(crm_sock_dir)
-chown $(HA_CCMUSER) $(DESTDIR)/$(crm_sock_dir)
-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_sock_dir)
-# -chmod g+w $(DESTDIR)/$(crm_sock_dir)
+ -chmod 750 $(DESTDIR)/$(crm_sock_dir)
------------------------------
Message: 2
Date: Sat, 17 Dec 2005 00:00:39 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in
Log Message:
Do not overwrite the value for NICINFO calculated in the conditional block
Use the calculated NETMASK in later calls to $FINDIF
Pass -C to $FINDIF so the calculated NETMASK is of the correct form
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- IPaddr.in 13 Nov 2005 17:16:43 -0000 1.30
+++ IPaddr.in 17 Dec 2005 07:00:39 -0000 1.31
@@ -205,20 +205,25 @@
NIC="$OCF_RESKEY_nic"
NETMASK="$OCF_RESKEY_netmask"
#
- # $FINDIF can deal with the condition of empty intermediate parameters.
+ # $FINDIF can NOT deal with the condition of empty intermediate
parameters.
#
- if [ ! -z "$OCF_RESKEY_netmask" ]; then
- NICINFO=`$FINDIF "$BASEIP/$NETMASK/$NIC/$BRDCAST"`
+ if [ ! -z "$NETMASK" ]; then
+ NICINFO=`$FINDIF -C "$BASEIP/$NETMASK/$NIC/$BRDCAST"`
else
- NICINFO=`$FINDIF "$BASEIP"`
+ NICINFO=`$FINDIF -C "$BASEIP"`
fi
- NICINFO=`$FINDIF "$BASEIP/$NETMASK/$NIC/$BRDCAST"`
if [ $? -eq 0 ]; then
NIC=`echo "$NICINFO" | cut -f1`
NETMASK=`echo "$NICINFO" | cut -f2`
BRDCAST=`echo "$NICINFO" | cut -f3`
+ case "$SYSTYPE" in
+ Darwin*)
+ NETMASK=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
+ BRDCAST=`echo "$NICINFO" | cut -f3 | cut -d ' ' -f2`
+ ;;
+ esac
else
ocf_log err "Failed: $FINDIF $BASEIP/$NETMASK/$NIC/$BRDCAST .
Parameter error."
exit $OCF_ERR_GENERIC
@@ -601,8 +606,8 @@
fi
FINDIFOPT=$BASEIP
- if [ ! -z "$OCF_RESKEY_netmask" ]; then
- FINDIFOPT=$FINDIFOPT/$OCF_RESKEY_netmask/$NIC/$BROADCAST
+ if [ -n $NETMASK ]; then
+ FINDIFOPT=$FINDIFOPT/$NETMASK/$NIC/$BROADCAST
fi
if
NICINFO=`$FINDIF $FINDIFOPT`
------------------------------
Message: 3
Date: Sat, 17 Dec 2005 01:56:37 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Added Files:
994.dot 994.exp 994.xml
Log Message:
Fix and regression test for 994
------------------------------
Message: 4
Date: Sat, 17 Dec 2005 01:56:37 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
regression.sh unpack.c
Log Message:
Fix and regression test for 994
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- regression.sh 19 Oct 2005 08:28:47 -0000 1.69
+++ regression.sh 17 Dec 2005 08:56:36 -0000 1.70
@@ -188,6 +188,7 @@
do_test 764 "Bugzilla 764"
do_test 797 "Bugzilla 797"
do_test 829 "Bugzilla 829"
+do_test 994 "Bugzilla 994"
echo ""
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- unpack.c 2 Nov 2005 17:37:28 -0000 1.147
+++ unpack.c 17 Dec 2005 08:56:36 -0000 1.148
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.147 2005/11/02 17:37:28 andrew Exp $ */
+/* $Id: unpack.c,v 1.148 2005/12/17 08:56:36 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1289,7 +1289,9 @@
if(is_stop_action) {
rsc->role = RSC_ROLE_STOPPED;
-
+ *on_fail = action_fail_ignore;
+ rsc->next_role = RSC_ROLE_UNKNOWN;
+
} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
rsc->role = RSC_ROLE_MASTER;
------------------------------
Message: 5
Date: Sat, 17 Dec 2005 02:36:34 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in
Log Message:
The calculated netmask was broken on Linux too.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- IPaddr.in 17 Dec 2005 07:00:39 -0000 1.31
+++ IPaddr.in 17 Dec 2005 09:36:34 -0000 1.32
@@ -216,14 +216,8 @@
if [ $? -eq 0 ]; then
NIC=`echo "$NICINFO" | cut -f1`
- NETMASK=`echo "$NICINFO" | cut -f2`
- BRDCAST=`echo "$NICINFO" | cut -f3`
- case "$SYSTYPE" in
- Darwin*)
- NETMASK=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
- BRDCAST=`echo "$NICINFO" | cut -f3 | cut -d ' ' -f2`
- ;;
- esac
+ NETMASK=`echo "$NICINFO" | cut -f2 | cut -d ' ' -f2`
+ BRDCAST=`echo "$NICINFO" | cut -f3 | cut -d ' ' -f2`
else
ocf_log err "Failed: $FINDIF $BASEIP/$NETMASK/$NIC/$BRDCAST .
Parameter error."
exit $OCF_ERR_GENERIC
------------------------------
_______________________________________________
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 38
********************************************
