Imported Debian patch 1.1.1-9

diff --git a/debian/changelog b/debian/changelog
index e8a22e2b55f945a2f78a2fe84d1dfc139b05a427..e4462efadcc15125eb983710583f06ff75e55f7c 100644 (file)
--- 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 6b6599da46ddda25d5f07e88e9227e52a0719f26..3364207f42d45cc1c1e81b40ecacdbf353b3f775 100644 (file)
--- 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 ]