From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31182 invoked by alias); 11 Mar 2008 19:10:50 -0000 Received: (qmail 31153 invoked by uid 9476); 11 Mar 2008 19:10:49 -0000 Date: Tue, 11 Mar 2008 19:10:00 -0000 Message-ID: <20080311191049.31138.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. gfs-kernel_0_1_22-68-gf49cfa0 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 966f6d098ec0576be68603852ea29e38fe12e7fc X-Git-Newrev: f49cfa0cdb5d5f3c739b361392f6c9a7e6ae6d53 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00298.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=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 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 - mastif=${mastif%%.*} + ## Strip possible VLAN (802.1q) suffixes + ## - Roland Gadinger + 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