This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, STABLE, updated. rgmanager_1_9_66-10-g67f3b6d
- From: lhh at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 11 Mar 2008 19:11:27 -0000
- Subject: Cluster Project branch, STABLE, updated. rgmanager_1_9_66-10-g67f3b6d
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=67f3b6dd2c711cb1077b88daea7bb6dd27fcf0ec
The branch, STABLE has been updated
via 67f3b6dd2c711cb1077b88daea7bb6dd27fcf0ec (commit)
from d9888e929c2dd0e8a9803abbd237dfb4fcb573e0 (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 67f3b6dd2c711cb1077b88daea7bb6dd27fcf0ec
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 2c6e6bd..0c47e66 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