From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 3 Apr 2015 16:59:12 +0000 (+0200)
Subject: nfs-server: Fix kernel version check in initscript.
X-Git-Tag: v2.17-core91~157^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=668ea5d311f10b63dd69718b9a43aa5d03029d5d;p=ipfire-2.x.git

nfs-server: Fix kernel version check in initscript.

nfsd requires a mounted nfsd filesystem which has been introduced in
the kernel 2.6 tree. To determine the current running kernel, a check
was included in the initscript which works fine until we switched to a kernel
version 3.x.

This commit fixes this check, so the nfs-server will startup again.

Fixes #10760.
---

diff --git a/lfs/nfs b/lfs/nfs
index d18487baa8..417f155fd2 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "portmap"
 
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server
index 397722c1c2..41055ad5b9 100644
--- a/src/initscripts/init.d/nfs-server
+++ b/src/initscripts/init.d/nfs-server
@@ -27,8 +27,8 @@ case "$1" in
 			loadproc /usr/sbin/rpc.rquotad
 		fi
 
-		# NFSD support only in 2.6 kernel
-		/bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
+		# NFSD support requires kernel 2.6 or newer.
+		/bin/uname -r | /bin/grep -E "^2.6|^3" 2>&1 > /dev/null
 		if [ $? = 0 ]; then
 			boot_mesg "Mounting nfsd virtual filesystem..."
 			/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
@@ -62,8 +62,8 @@ case "$1" in
 		/usr/sbin/exportfs -au 2>&1 > /dev/null
 		evaluate_retval
 
-		# NFSD support only in 2.6 kernel
-                /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
+		# NFSD support requires kernel 2.6 or newer.
+                /bin/uname -r | /bin/grep -E "^2.6|^3" 2>&1 > /dev/null
                 if [ $? = 0 ]; then
 			boot_mesg "Unmounting NFS Virtual Filesystem..."
 			/bin/umount /proc/fs/nfsd 2>&1 > /dev/null