Imported Debian patch 1.2.0-4.1

diff --git a/debian/changelog b/debian/changelog
index 6ae86aaf96e0f622be3990f573fd2dba94e2caf6..0e502944255f31a260c9859fa083924d935a2fb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.2.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix test for NFS kernel server support in init script; closes: #550153
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 16 Dec 2009 22:14:01 +0000
+
 nfs-utils (1:1.2.0-4) unstable; urgency=low
 
   * Removing myself from uploaders.

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 2f675be128045bfca5294f06fb95fc75c0b82716..4b04fe2906966fb39b19cefa723225bcc0a1f5b1 100644 (file)
--- 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
-               if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd|     )' /proc/kallsyms; then
+               if ! [ -d /sys/module/nfsd ]; then
                        log_warning_msg "Not starting $DESC: no support in current kernel."
                        exit 0
                fi