Cluster Project branch, master, updated. gfs-kernel_0_1_22-68-gf49cfa0

Cluster Project branch, master, updated. gfs-kernel_0_1_22-68-gf49cfa0

[lhh]

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=f49cfa0cdb5d5f3c739b361392f6c9a7e6ae6d53

The branch, master has been updated
       via  f49cfa0cdb5d5f3c739b361392f6c9a7e6ae6d53 (commit)
      from  966f6d098ec0576be68603852ea29e38fe12e7fc (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 f49cfa0cdb5d5f3c739b361392f6c9a7e6ae6d53
Author: Lon Hohberger <lhh@redhat.com>
Date:   Tue Mar 11 14:54:49 2008 -0400

    [rgmanager] Make ip.sh check link states of non-ethernet devices
    
    Resolves: Red Hat Bugzilla #331661

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

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 fe97391..66b4c2e 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