From: Steinar H. Gunderson <sesse@debian.org>
Date: Sun, 18 Nov 2007 18:14:48 +0000 (+0100)
Subject: Imported Debian patch 1.1.1-9
X-Git-Tag: debian/1%1.1.1-9^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=e13c92fa7f2a4925900470457b09ae91a504ba25;ds=sidebyside

Imported Debian patch 1.1.1-9
---

diff --git a/debian/changelog b/debian/changelog
index e8a22e2..e4462ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.1.1-9) unstable; urgency=high
+
+  * Re-add modprobing of the "nfs" module (leaving the sunrpc module, so as
+    not to break what the previous change fixed), as mount is not capable of
+    auto-loading it on demand. (Closes: #451782)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 18 Nov 2007 19:14:48 +0100
+
 nfs-utils (1:1.1.1-8) unstable; urgency=low
 
   * When starting idmapd or gssd, load the sunrpc module instead of the
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 6b6599d..3364207 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -148,6 +148,7 @@ case "$1" in
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
 	    do_modprobe sunrpc
+	    do_modprobe nfs
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]