From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19702 invoked by alias); 31 Mar 2009 06:48:47 -0000 Received: (qmail 19664 invoked by alias); 31 Mar 2009 06:48:47 -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: cluster: STABLE3 - cman init: prepare for fence_xvmd standalone operations To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: c9f692f5fb5116bdb5723c2959e31dd61de8a2bf X-Git-Newrev: f2403d0b27b164f575af8edcfd52ffe097d17e97 From: "Fabio M. Di Nitto" Message-Id: <20090331064827.7D2C0120306@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 06:48: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/msg00981.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f2403d0b27b164f575af8edcfd52ffe097d17e97 Commit: f2403d0b27b164f575af8edcfd52ffe097d17e97 Parent: c9f692f5fb5116bdb5723c2959e31dd61de8a2bf Author: Fabio M. Di Nitto AuthorDate: Tue Mar 31 08:47:09 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Mar 31 08:47:09 2009 +0200 cman init: prepare for fence_xvmd standalone operations implement simple and generic check to parse FENCE_XVMD_OPTS. implement generic check to verify if fence_xvmd should run standalone. switch fence_xvmd_enabled to use check_fence_opt for ccs operations. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index e26627d..3324268 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -337,6 +337,19 @@ fence_join_enabled() fi } +check_fence_opt() +{ + for i in $(getopt dfi:a:p:I:C:U:c:k:u?hLXV $FENCE_XVMD_OPTS); do + [ -$1 = $i ] && return 0 + done + return 1 +} + +fence_xvmd_standalone() +{ + check_fence_opt L +} + fence_xvmd_enabled() { fence_join_enabled || return 1 @@ -347,7 +360,7 @@ fence_xvmd_enabled() # we'll start it anyway since ccsd is not required) # if cman_running && \ - [ "$FENCE_XVMD_OPTS" = "${FENCE_XVMD_OPTS/-X/}" ]; then + ! check_fence_opt X; then ccs_tool query /cluster/fence_xvmd \ > /dev/null 2>&1 || return 1 fi