Imported Debian patch 1.0.7-9

diff --git a/debian/changelog b/debian/changelog
index bbb9d2991b1dcf2694ae3bfbd66a5cf30586426c..5b74a341c8c394f0fa538bb62fba99e434e4a693 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.0.7-9) unstable; urgency=low
+
+  * When checking for nfsd support in the kernel, check for init_nfsd
+    (which is a function) rather than nfsd_version (which is a variable);
+    kernels compiled without CONFIG_KALLSYMS_ALL=y have only the former.
+    (Closes: #361026)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu,  6 Apr 2006 13:31:48 +0200
+

 nfs-utils (1:1.0.7-8) unstable; urgency=low
 
   * Don't complain about missing sync/async for a read-only export.
 nfs-utils (1:1.0.7-8) unstable; urgency=low
 
   * Don't complain about missing sync/async for a read-only export.

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 922b7349f49481b0c36f34ef2569b726d7574d7f..0cd93a0279054ff4c5a8dd5ffa6629337baf7085 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -64,7 +64,7 @@ case "$1" in
                do_modprobe nfsd
 
                # See if our running kernel supports the NFS kernel server
                do_modprobe nfsd
 
                # See if our running kernel supports the NFS kernel server

-               if [ -f /proc/kallsyms ] && ! grep -q nfsd_version /proc/kallsyms; then
+               if [ -f /proc/kallsyms ] && ! grep -q init_nfsd /proc/kallsyms; then

                        echo "Not starting $DESC: no support in current kernel."
                        exit 0
                fi
                        echo "Not starting $DESC: no support in current kernel."
                        exit 0
                fi