rpms/nfs-utils/devel nfs-utils.spec,1.194,1.195 nfs.init,1.31,1.32

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29015

Modified Files:
	nfs-utils.spec nfs.init 
Log Message:
- Fixed typo in nfs init script that caused rpc.rquotad daemons
  to be started but not stoppped (bz 473929)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- nfs-utils.spec	1 Dec 2008 13:31:39 -0000	1.194
+++ nfs-utils.spec	1 Dec 2008 14:19:25 -0000	1.195
@@ -256,6 +256,8 @@
 * Mon Dec  1 2008 Steve Dickson <steved at redhat.com> 1.1.4-5
 - 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)
 
 * Wed Nov 26 2008 Steve Dickson <steved at redhat.com> 1.1.4-4
 - gssd: unblock DNOTIFY_SIGNAL in case it was blocked


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nfs.init	1 Dec 2008 13:31:39 -0000	1.31
+++ nfs.init	1 Dec 2008 14:19:25 -0000	1.32
@@ -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 @@
     	{ 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