[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-64-g85f99a1

[lhh@sourceware.org <lhh@sourceware.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=85f99a1f7de8252a73582399194478ad7b2a5845

The branch, RHEL5 has been updated
       via  85f99a1f7de8252a73582399194478ad7b2a5845 (commit)
      from  6bb8188b10227bb97a0fb1cbca88e5fc9a236f2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85f99a1f7de8252a73582399194478ad7b2a5845
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu May 8 16:58:46 2008 -0400

    [rgmanager] Fix #331661.  Make non-ethernet bonding slaves work

-----------------------------------------------------------------------

Summary of changes:
 rgmanager/src/resources/ip.sh |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
index 0057e27..138c937 100755
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -444,22 +444,14 @@ findSlaves()
 		return $OCF_ERR_GENERIC
 	fi
 
-       ## Strip possible VLAN (802.1q) suffixes 
-       ##  - Roland Gadinger <roland.gadinger@beko.at> 
-       mastif=${mastif%%.*} 
+	## Strip possible VLAN (802.1q) suffixes 
+	##  - Roland Gadinger <roland.gadinger@beko.at> 
+	mastif=${mastif%%.*} 
 
 	while read line; do
 		set - $line
-		while [ $# -gt 0 ]; do
-			case $1 in
-			eth*:)
-				interfaces="${1/:/} $interfaces"
-				continue 2
-				;;
-			esac
-			shift
-		done
-	done < <( /sbin/ip link list | grep "master $mastif" )
+		interfaces="${2/:/} $interfaces"
+	done < <( /sbin/ip -o link list | grep "master $mastif" )
 
 	echo $interfaces
 }


hooks/post-receive
--
Cluster Project