rpms/nfs-utils/F-10 nfs-utils.spec,1.190,1.191 nfs.init,1.30,1.31

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24006

Modified Files:
	nfs-utils.spec nfs.init 
Log Message:
- Make sure /proc/fs/nfsd exists when the nfs init script
  does the exports (bz 473396)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- nfs-utils.spec	18 Oct 2008 14:01:23 -0000	1.190
+++ nfs-utils.spec	1 Dec 2008 13:45:10 -0000	1.191
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -241,6 +241,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec  1 2008 Steve Dickson <steved at redhat.com> 1.1.4-2
+- Make sure /proc/fs/nfsd exists when the nfs init script
+  does the exports (bz 473396)
+
 * Sat Oct 18 2008 Steve Dickson <steved at redhat.com> 1.1.4-1
 - Updated to latest upstream version: 1.1.4
 


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs.init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nfs.init	18 Sep 2008 11:49:19 -0000	1.30
+++ nfs.init	1 Dec 2008 13:45:10 -0000	1.31
@@ -55,6 +55,11 @@
 	# Start daemons.
 	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start
 
+	# Load the nfsd module so /proc/fs/nfsd will exist
+	[ "$NFSD_MODULE" != "noload" ] && {
+		[ -x /sbin/modprobe ] && /sbin/modprobe nfsd
+	}
+
 	action $"Starting NFS services: " /usr/sbin/exportfs -r
 
 	# Set the ports lockd should listen on
@@ -74,11 +79,6 @@
 	    echo
 	fi
 
-	# Load preload module so arguments to rpc.nfsd will take effect
-	[ -n "$RPCNFSDARGS" -a "$NFSD_MODULE" != "noload" ] && {
-		[ -x /sbin/modprobe ] && /sbin/modprobe nfsd
-	}
-
 	echo -n $"Starting NFS daemon: "
 	daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT
 	RETVAL=$?