master - init: standardize init scripts to /etc/sysconfig/cluster

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d9a282126c54e371f783c2a3f5ff24b53e685f87
Commit:        d9a282126c54e371f783c2a3f5ff24b53e685f87
Parent:        a768396976d39e417a0ce5db8e7bb444b3ef1647
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Jul 30 12:34:07 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jul 30 12:34:07 2008 +0200

init: standardize init scripts to /etc/sysconfig/cluster

Allow users to set everything from one single external config file
rather than several.

Retain backward compatibility by sourcing the old files and warning
about the change.

If a config option is present in both old and new file, the value from
the new file will be used.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman               |    9 ++++++++-
 fence/agents/scsi/scsi_reserve |    4 ++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/cman/init.d/cman b/cman/init.d/cman
index 127f884..4ed6ec0 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 deprecated 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..a6918d8 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 deprecated 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