diff --git a/nfs-utils.spec b/nfs-utils.spec index b7d5663..8d97003 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -244,6 +244,8 @@ fi * Mon Dec 1 2008 Steve Dickson 1.1.4-2 - Make sure /proc/fs/nfsd exists when the nfs init script does the exports (bz 473396) +- Fixed typo in nfs init script that caused rpc.rquotad daemons + to be started but not stoppped (bz 473929) * Sat Oct 18 2008 Steve Dickson 1.1.4-1 - Updated to latest upstream version: 1.1.4 diff --git a/nfs.init b/nfs.init index 1818e3b..643cfab 100755 --- a/nfs.init +++ b/nfs.init @@ -16,6 +16,12 @@ # Source networking configuration. [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network +# Check for and source configuration file otherwise set defaults +[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs + +# Remote quota server +[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad` + RETVAL=0 # See how we were called. @@ -40,18 +46,12 @@ case "$1" in { touch /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \ { echo "/etc/exports does not exist" ; exit 0 ; } - # Check for and source configuration file otherwise set defaults - [ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs - [ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=default [ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=default # Number of servers to be started by default [ -z "$RPCNFSDCOUNT" ] && RPCNFSDCOUNT=8 - # Remote quota server - [ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad` - # Start daemons. [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start