rpms/nfs-utils/devel nfs-utils.spec, 1.187, 1.188 nfs.init, 1.29, 1.30 nfs.sysconfig, 1.4, 1.5

[Steve Dickson]

Author: steved

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

Modified Files:
	nfs-utils.spec nfs.init nfs.sysconfig 
Log Message:
Pre-load nfsd when args to rpc.nfsd are given (bz 441983)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- nfs-utils.spec	16 Sep 2008 20:29:11 -0000	1.187
+++ nfs-utils.spec	18 Sep 2008 11:49:19 -0000	1.188
@@ -265,9 +265,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Tue Sep 16 2008 Steve Dickson <steved at redhat.com> 1.1.3-5
+* Thu Sep 18 2008 Steve Dickson <steved at redhat.com> 1.1.3-5
 - Reworked init scripts so service will be able to
   stop when some of the checks fail. (bz 462508)
+- Pre-load nfsd when args to rpc.nfsd are given (bz 441983)
 
 * Thu Aug 28 2008 Steve Dickson <steved at redhat.com> 1.1.3-4
 - Added in a number of up upstream patches (101 thru 110).


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nfs.init	16 Sep 2008 20:29:11 -0000	1.29
+++ nfs.init	18 Sep 2008 11:49:19 -0000	1.30
@@ -73,6 +73,12 @@
 		RETVAL=$?
 	    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=$?


Index: nfs.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.sysconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nfs.sysconfig	25 Apr 2008 15:39:48 -0000	1.4
+++ nfs.sysconfig	18 Sep 2008 11:49:19 -0000	1.5
@@ -31,6 +31,8 @@
 # Number of nfs server processes to be started.
 # The default is 8. 
 #RPCNFSDCOUNT=8
+# Stop the nfsd module from being pre-loaded
+#NFSD_MODULE="noload"
 #
 #
 # Optional arguments passed to rpc.mountd. See rpc.mountd(8)