From mboxrd@z Thu Jan  1 00:00:00 1970
From: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Mon, 28 Jul 2008 10:20:49 +0200 (CEST)
Subject: [Cluster-devel] [PATCH/RFC] Standardize on /etc/sysconfig/cluster
	for init script
Message-ID: <Pine.LNX.4.64.0807281017480.27368@trider-g7>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit


Hi guys,

I just noticed that we have a very inconsistent way to set init script 
defaults by using /etc/sysconfig/{cman,cluster,scsi_reserve}.

the patch in attachment is very simple and standardize everything to 
/etc/sysconfig/cluster and retains backward compatibility.

Please ACK or i will apply.

Fabio

--
I'm going to make him an offer he can't refuse.
-------------- next part --------------
diff --git a/cman/init.d/cman b/cman/init.d/cman
index f489dd1..7cedd26 100644
--- a/cman/init.d/cman
+++ b/cman/init.d/cman
@@ -18,7 +18,14 @@
 
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman
+if [ -f /etc/sysconfig/cman ]; then
+    . /etc/sysconfig/cman
+    echo "/etc/sysconfig/cman has been depracated in favour of /etc/sysconfig/cluster"
+    echo "Please consider switching to the new file"
+fi
+
+[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+
 [ -z "$CCSD_OPTS" ] && CCSD_OPTS=
 
 # CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 3d66991..7569873 100644
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -21,8 +21,12 @@
 #
 if [ -f /etc/sysconfig/scsi_reserve ] ; then
     . /etc/sysconfig/scsi_reserve
+    echo "/etc/sysconfig/scsi_reserve has been depracated in favour of /etc/sysconfig/cluster"
+    echo "Please consider switching to the new file"
 fi
 
+[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+
 # check that cman is running
 #
 if ! cman_tool status &> /dev/null ; then