revised sysconfig and init.d scripts

N.B. glusterfsd.{init,sysconfig,service} should go away. Glusterd is
responsible for starting and stopping the glusterfsd(s)
This commit is contained in:
Kaleb KEITHLEY 2011-12-07 13:34:09 -05:00
parent 5685efb997
commit a61c3d3795
5 changed files with 11 additions and 11 deletions

View File

@ -24,7 +24,7 @@ exec="/usr/sbin/glusterd"
prog="glusterd"
# Set defaults, then source config for eventual overrides
GLUSTERFSD_NOFILE="65536"
GLUSTERD_NOFILE="65536"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@ -32,10 +32,9 @@ lockfile=/var/lock/subsys/$prog
start() {
[ -x $exec ] || exit 5
[ -f $GLUSTERFSD_CONFIG ] || exit 6
ulimit -n $GLUSTERFSD_NOFILE
ulimit -n $GLUSTERD_NOFILE
echo -n $"Starting $prog: "
daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterd.pid
daemon $exec${GLUSTERD_LOGFILE+" -l $GLUSTERD_LOGFILE"}${GLUSTERD_LOGLEVEL+" -L $GLUSTERD_LOGLEVEL"} -p /var/run/glusterd.pid
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile

View File

@ -1,8 +1,6 @@
# Change the glusterd service defaults here.
# See "glusterd --help" outpout for defaults and possible values.
#GLUSTERFSD_CONFIG="/etc/gluster/glusterd.vol"
#GLUSTERFSD_LOGFILE="/var/log/gluster/gluster.log"
#GLUSTERFSD_LOGLEVEL="NORMAL"
#GLUSTERFSD_NOFILE="65536"
#GLUSTERD_LOGFILE="/var/log/gluster/gluster.log"
#GLUSTERD_LOGLEVEL="NORMAL"

View File

@ -25,7 +25,7 @@
Summary: Cluster File System
Name: glusterfs
Version: 3.2.5
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3
Group: System Environment/Base
Vendor: Red Hat
@ -391,6 +391,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
* Wed Dec 7 2011 Kaleb S. KEITHLEY <kkeithle@redhat.com> - 3.2.5-4
- revised sysconfig and init.d scripts. (glusterfsd.{init,sysconfig,service}
should go away, as glusterd is responsible for starting and stopping it.)
* Wed Nov 23 2011 Kaleb S. KEITHLEY <kkeithle@redhat.com> - 3.2.5-3
- revised libglusterfs/src/Makefile.* to (re)enable parallel make

View File

@ -32,7 +32,7 @@ lockfile=/var/lock/subsys/$prog
start() {
[ -x $exec ] || exit 5
[ -f $GLUSTERFSD_CONFIG ] || exit 6
[ $GLUSTERFSD_CONFIG -o -f $GLUSTERFSD_CONFIG ] || exit 6
ulimit -n $GLUSTERFSD_NOFILE
echo -n $"Starting $prog: "
daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid

View File

@ -4,5 +4,4 @@
#GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
#GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
#GLUSTERFSD_LOGLEVEL="NORMAL"
#GLUSTERFSD_NOFILE="65536"