[module-init-tools/f16] drop sunrpc and nfsd rules from modprobe-dist.conf to fix NFS service startup on boot (RHBZ #744463)

[Adam Williamson]

commit 13eae850c36c4d57f40b051ae8e3e336fac2b0f4
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Oct 29 15:34:52 2011 -0700

    drop sunrpc and nfsd rules from modprobe-dist.conf to fix NFS service
    startup on boot (RHBZ #744463)

 modprobe-dist.conf     |    5 -----
 module-init-tools.spec |    6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/modprobe-dist.conf b/modprobe-dist.conf
index 5ae3ed5..88e84df 100644
--- a/modprobe-dist.conf
+++ b/modprobe-dist.conf
@@ -120,8 +120,6 @@ alias digest_null crypto_null
 alias compress_null crypto_null
 alias sha384 sha512
 install binfmt-0000 /bin/true
-install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; }
-install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; }
 install char-major-10 /bin/true
 install char-major-10-1 /bin/true
 install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
@@ -134,9 +132,6 @@ install scsi_hostadapter /bin/true
 install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
 remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
 remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
-remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc
-remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd
-
 
 alias usb-uhci uhci-hcd
 alias usb-ohci ohci-hcd
diff --git a/module-init-tools.spec b/module-init-tools.spec
index 470c96b..846558e 100644
--- a/module-init-tools.spec
+++ b/module-init-tools.spec
@@ -4,7 +4,7 @@ Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.16
 # Release: 0.1.%{pre_release}%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 #Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
@@ -82,6 +82,10 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Sat Oct 29 2011 Adam Williamson <awilliam at redhat.com> 3.16-3
+- drop sunrpc and nfsd rules from modprobe-dist.conf to fix NFS
+  service startup on boot (RHBZ #744463)
+
 * Mon Jul 18 2011 Matthew Garrett <mjg at redhat.com> 3.16-2
 - Don't search /usr/local for configuration (rhbz: #714023)