This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - config validation: fix override
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 3 Sep 2009 17:28:37 +0000 (UTC)
- Subject: cluster: STABLE3 - config validation: fix override
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