From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-7893-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 32422 invoked by alias); 11 Mar 2008 19:11:18 -0000
Received: (qmail 32371 invoked by uid 9476); 11 Mar 2008 19:11:17 -0000
Date: Tue, 11 Mar 2008 19:11:00 -0000
Message-ID: <20080311191117.32349.qmail@sourceware.org>
From: lhh@sourceware.org
To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com
Subject: Cluster Project branch, STABLE2, updated. cluster-2.02.00-10-ged685c5
X-Git-Refname: refs/heads/STABLE2
X-Git-Reftype: branch
X-Git-Oldrev: 7bf8c23aebfe9097222955cb98383743e2a35965
X-Git-Newrev: ed685c5699aaf592ba3714529dce9f9719c34b10
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2008-q1/txt/msg00299.txt.bz2

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

The branch, STABLE2 has been updated
       via  ed685c5699aaf592ba3714529dce9f9719c34b10 (commit)
      from  7bf8c23aebfe9097222955cb98383743e2a35965 (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 ed685c5699aaf592ba3714529dce9f9719c34b10
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