From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11808-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 3784 invoked by alias); 3 Sep 2009 17:29:01 -0000
Received: (qmail 3775 invoked by alias); 3 Sep 2009 17:29:00 -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
	bastion2.fedora.phx.redhat.com
Subject: cluster: STABLE3 - config validation: fix override
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: e03770c19ad0145c81b2549b17ed77667110c697
X-Git-Newrev: 015f6e441998848d4c32a95d99ba273497c02c37
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090903172837.E81D51201C5@lists.fedorahosted.org>
Date: Thu, 03 Sep 2009 17:29:00 -0000
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q3/txt/msg00305.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=015f6e441998848d4c32a95d99ba273497c02c37
Commit:        015f6e441998848d4c32a95d99ba273497c02c37
Parent:        e03770c19ad0145c81b2549b17ed77667110c697
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Sep 3 19:28:14 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Sep 3 19:28:14 2009 +0200

config validation: fix override

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 config/tools/xml/ccs_config_validate.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/tools/xml/ccs_config_validate.in b/config/tools/xml/ccs_config_validate.in
index 0352ffa..4d028fe 100644
--- a/config/tools/xml/ccs_config_validate.in
+++ b/config/tools/xml/ccs_config_validate.in
@@ -2,8 +2,6 @@
 
 set -e
 
-[ -n "$1" ] && export COROSYNC_CLUSTER_CONFIG_FILE="$1"
-
 # rpm based distros
 if [ -d /etc/sysconfig ]; then
 	[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
@@ -19,6 +17,8 @@ fi
 [ -z "$CONFIG_LOADER" ] && CONFIG_LOADER=xmlconfig
 export COROSYNC_DEFAULT_CONFIG_IFACE=$CONFIG_LOADER:cmanpreconfig
 
+[ -n "$1" ] && export COROSYNC_CLUSTER_CONFIG_FILE="$1"
+
 tempfile=$(mktemp)
 
 if [ -z "$tempfile" ]; then