master - misc: init scripts clean up

master - misc: init scripts clean up

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dcdbcd10121c1aa04f9ccffe94aacbeb3c366c07
Commit:        dcdbcd10121c1aa04f9ccffe94aacbeb3c366c07
Parent:        7f1a004b959bf0dade163b27e191b0e421ceeee7
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Aug 28 09:38:04 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Aug 28 09:38:04 2008 +0200

misc: init scripts clean up

after discussion on cluster-devel mailing list, each init script should
include /etc/sysconfig/$init_script_name.

change all init scripts to source /etc/sysconfig/cluster for backward
compatibility and then source /etc/sysconfig/$init_script_name to give
priority to proper config file.

remove also warnings about obsolete scripts.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman               |    7 +------
 cman/init.d/qdiskd             |    1 +
 fence/agents/scsi/scsi_reserve |    7 +------
 gfs/init.d/gfs                 |    1 +
 gfs2/init.d/gfs2               |    1 +
 rgmanager/init.d/rgmanager     |    1 +
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/cman/init.d/cman b/cman/init.d/cman
index 4778fa8..d375acc 100644
--- a/cman/init.d/cman
+++ b/cman/init.d/cman
@@ -18,13 +18,8 @@
 
 . /etc/init.d/functions
 
-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
+[ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman
 
 [ -z "$CCSD_OPTS" ] && CCSD_OPTS=
 
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
index 62bd33f..d77057c 100644
--- a/cman/init.d/qdiskd
+++ b/cman/init.d/qdiskd
@@ -17,6 +17,7 @@
 
 . /etc/init.d/functions
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+[ -f /etc/sysconfig/qdiskd ] && . /etc/sysconfig/qdiskd
 
 LOCK_FILE="/var/lock/subsys/qdiskd"
 
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index a6918d8..6aeccc6 100644
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -19,13 +19,8 @@
 
 # read in config file if it exists
 #
-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
+[ -f /etc/sysconfig/scsi_reserve ] && . /etc/sysconfig/scsi_reserve
 
 # check that cman is running
 #
diff --git a/gfs/init.d/gfs b/gfs/init.d/gfs
index 8116db1..e212a04 100644
--- a/gfs/init.d/gfs
+++ b/gfs/init.d/gfs
@@ -17,6 +17,7 @@
 
 . /etc/init.d/functions
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+[ -f /etc/sysconfig/gfs ] && . /etc/sysconfig/gfs
 
 #
 # This script's behavior is modeled closely after the netfs script.  
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
index 146d789..cbe37fd 100644
--- a/gfs2/init.d/gfs2
+++ b/gfs2/init.d/gfs2
@@ -17,6 +17,7 @@
 
 . /etc/init.d/functions
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+[ -f /etc/sysconfig/gfs2 ] && . /etc/sysconfig/gfs2
 
 #
 # This script's behavior is modeled closely after the netfs script.  
diff --git a/rgmanager/init.d/rgmanager b/rgmanager/init.d/rgmanager
index d307c17..361a65e 100644
--- a/rgmanager/init.d/rgmanager
+++ b/rgmanager/init.d/rgmanager
@@ -18,6 +18,7 @@
 
 # Grab cluster start config if it exists
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+[ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin