From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio M. Di Nitto Date: Thu, 31 Jul 2008 05:24:36 +0200 (CEST) Subject: [Cluster-devel] [PATCH/RFC] Standardize on /etc/sysconfig/cluster for init script In-Reply-To: <20080730191241.GA9054@mail.oracle.com> References: <20080730160107.GA9631@redhat.com> <20080730191241.GA9054@mail.oracle.com> Message-ID: List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed, 30 Jul 2008, Joel Becker wrote: > On Wed, Jul 30, 2008 at 11:01:07AM -0500, David Teigland wrote: >> On Mon, Jul 28, 2008 at 10:20:49AM +0200, Fabio M. Di Nitto wrote: >>> 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. >> >> Doesn't it make most sense for the name of the sysconfig file to match the >> name of the init script it corresponds to? i.e. the config file for >> init.d/cman would be sysconfig/cman? > > They should absolutely match the init script. I could perhaps > seen an exception for something everything includes, but then I would > have the other sysconfig files include it. What do I mean? Say you > have a sysconfig/cluster file you want everything to see (cman, > fs_controld, etc). You would have sysconfig/cman source > sysconfig/cluster. That way, someone reading sysconfig/cman would see > it. I would think we want to avoid folks having to read the init script > to find the config files. How about the patch in attachment? > Btw, let's all remember that 'sysconfig' is spelled 'default' on > debian/ubuntu, so be aware of that in your scripts :-) Our scripts are rpmworld centric at the moment. It should be possible at others as well. 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 4ed6ec0..5ff172d 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