From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14194 invoked by alias); 12 Mar 2009 15:10:02 -0000 Received: (qmail 14138 invoked by alias); 12 Mar 2009 15:10:01 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: resource-agents: master - rgmanager: Fix ip start phase with monitor_link="0" To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: resource-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d7359cef226252fe3754fd4330111108a191920f X-Git-Newrev: fbc8a98d6c8f79aea5a7fb39b5074e97b2ea5187 From: Lon Hohberger Message-Id: <20090312150932.7E86C120198@lists.fedorahosted.org> Date: Thu, 12 Mar 2009 15:10:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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: 2009-q1/txt/msg00757.txt.bz2 Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=fbc8a98d6c8f79aea5a7fb39b5074e97b2ea5187 Commit: fbc8a98d6c8f79aea5a7fb39b5074e97b2ea5187 Parent: d7359cef226252fe3754fd4330111108a191920f Author: Lon Hohberger AuthorDate: Mon Mar 9 11:40:40 2009 -0400 Committer: Lon Hohberger CommitterDate: Thu Mar 12 11:09:30 2009 -0400 rgmanager: Fix ip start phase with monitor_link="0" Signed-off-by: Lon Hohberger --- rgmanager/src/resources/ip.sh | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh index 245dcf5..7a7d6c5 100644 --- a/rgmanager/src/resources/ip.sh +++ b/rgmanager/src/resources/ip.sh @@ -615,10 +615,13 @@ ipv6() if [ $? -ne 0 ]; then continue fi - network_link_up $dev - if [ $? -ne 0 ]; then - continue - fi + if [ "$OCF_RESKEY_monitor_link" = "yes" ]; then + network_link_up $dev + if [ $? -ne 0 ]; then + continue + fi + fi + if [ "${addr/\/*/}" = "${addr}" ]; then addr="$addr/$maskbits" fi @@ -684,9 +687,11 @@ ipv4() if [ $? -ne 0 ]; then continue fi - network_link_up $dev - if [ $? -ne 0 ]; then - continue + if [ "$OCF_RESKEY_monitor_link" = "yes" ]; then + network_link_up $dev + if [ $? -ne 0 ]; then + continue + fi fi if [ "${addr/\/*/}" = "${addr}" ]; then @@ -802,15 +807,9 @@ ip_op() { declare dev declare rtr - declare monitor_link declare addr=${3/\/*/} - monitor_link="yes" - if [ "${OCF_RESKEY_monitor_link}" = "no" ] || - [ "${OCF_RESKEY_monitor_link}" = "0" ]; then - monitor_link="no" - fi - + if [ "$2" = "status" ]; then ocf_log debug "Checking $3, Level $OCF_CHECK_LEVEL" @@ -822,7 +821,7 @@ ip_op() fi ocf_log debug "$3 present on $dev" - if [ "$monitor_link" = "yes" ]; then + if [ "$OCF_RESKEY_monitor_link" = "yes" ]; then if ! network_link_up $dev; then ocf_log warn "No link on $dev..." return 1 @@ -873,11 +872,13 @@ if [ -z "$OCF_CHECK_LEVEL" ]; then OCF_CHECK_LEVEL=0 fi -if [ -z "$OCF_RESKEY_monitor_link" ]; then +if [ "${OCF_RESKEY_monitor_link}" = "no" ] || + [ "${OCF_RESKEY_monitor_link}" = "0" ]; then + OCF_RESKEY_monitor_link="no" +else OCF_RESKEY_monitor_link="yes" fi - case $1 in start) if address_configured ${OCF_RESKEY_family} ${OCF_RESKEY_address}; then