From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 16 Dec 2009 22:14:01 +0000 (+0000)
Subject: Imported Debian patch 1.2.0-4.1
X-Git-Tag: debian/1%1.2.0-4.1^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=18cd67d0f01ac7fb916aba18fedfb8daa013cd4b;p=nfs-utils.git

Imported Debian patch 1.2.0-4.1
---

diff --git a/debian/changelog b/debian/changelog
index 6ae86aa..0e50294 100644
--- 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 2f675be..4b04fe2 100644
--- 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