From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20074 invoked by alias); 27 Mar 2009 14:24:28 -0000 Received: (qmail 20066 invoked by alias); 27 Mar 2009 14:24:26 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 - fence_xvmd: Make -L imply -X. 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: 1588f4cb84492d85dd6dda95ac5560ebf337b3f8 X-Git-Newrev: e54efddef3ebb3c139a6d1f8514b05ee2ec68053 From: Lon Hohberger Message-Id: <20090327142355.F3494120150@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 14:24: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/msg00916.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e54efddef3ebb3c139a6d1f8514b05ee2ec68053 Commit: e54efddef3ebb3c139a6d1f8514b05ee2ec68053 Parent: 1588f4cb84492d85dd6dda95ac5560ebf337b3f8 Author: Lon Hohberger AuthorDate: Fri Mar 27 10:11:06 2009 -0400 Committer: Lon Hohberger CommitterDate: Fri Mar 27 10:23:20 2009 -0400 fence_xvmd: Make -L imply -X. Obvious change: local only should imply no-cluster mode. Signed-off-by: Lon Hohberger Signed-off-by: Fabio M. Di Nitto --- fence/agents/xvm/options.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 5dd6781..15d80b6 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -267,6 +267,7 @@ assign_noccs(fence_xvm_args_t *args, struct arg_info *arg, char *value) static inline void assign_nocluster(fence_xvm_args_t *args, struct arg_info *arg, char *value) { + args->flags |= F_NOCCS; args->flags |= F_NOCLUSTER; } @@ -365,7 +366,7 @@ static struct arg_info _arg_info[] = { assign_noccs }, { 'L', "-L", NULL, - "Local mode only (no cluster)", + "Local mode only (no cluster; implies -X)", assign_nocluster }, { 'U', "-U", "uri",