From 60a792996d27bd1213d0ae64a0fe722129c60964 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Mon, 1 Dec 2008 13:31:39 +0000
Subject: [PATCH] - Make sure /proc/fs/nfsd exists when the nfs init script
 does the exports     (bz 473396)

---
 nfs-utils.spec |  6 +++++-
 nfs.init       | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index b5b7622..f9b025d 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -253,6 +253,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Dec  1 2008 Steve Dickson <steved@redhat.com> 1.1.4-5
+- Make sure /proc/fs/nfsd exists when the nfs init script
+  does the exports (bz 473396)
+
 * Wed Nov 26 2008 Steve Dickson <steved@redhat.com> 1.1.4-4
 - gssd: unblock DNOTIFY_SIGNAL in case it was blocked
 - Ensure statd gets started if required when non-root
diff --git a/nfs.init b/nfs.init
index e26e9e7..1818e3b 100755
--- a/nfs.init
+++ b/nfs.init
@@ -55,6 +55,11 @@ case "$1" in
 	# 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 @@ case "$1" in
 	    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=$?