Imported Debian patch 1.0.9-3

diff --git a/debian/changelog b/debian/changelog
index 59cc3c63e9bce1bd6b845aed101b705f9ecbce14..2b89c9702eaf9035b7deb548de07fd7b5b6a8a98 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.0.9-3) unstable; urgency=low
+
+  * Don't automatically assume that the kernel is modular if /sbin/modprobe
+    is available, check for /proc/modules as well; patch from Nicolas
+    Trecourt. (Closes: #377685)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 13 Jul 2006 21:39:08 +0200
+
 nfs-utils (1:1.0.9-2) unstable; urgency=low
 
   * Merge changes from 1.0.9-1 and 1.0.9pre1-4:

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index aca28028a5eb4e782f6f7d4f42b4698d35f2c9df..52913ae553f909d0a216115be74b0b624e6a2c48 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -37,7 +37,7 @@ fi
 . /lib/lsb/init-functions
 
 do_modprobe() {
-    if [ -x /sbin/modprobe ]
+    if [ -x /sbin/modprobe -a -f /proc/modules ]
     then
         modprobe -q "$1" || true
     fi