[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2be0bc4410b7d2f5039eae7b464db7b8ee6564db

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2591 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  2be0bc4410b7d2f5039eae7b464db7b8ee6564db (commit)
      from  ca6be40f92988ec3202e1f669c1a033bbbf3cd38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2be0bc4410b7d2f5039eae7b464db7b8ee6564db
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Apr 4 13:59:11 2015 +0200

    nfs-server: Drop kernel version check from initscript.
    
    As suggested on the bugtracker, the kernel version check completely has been
    removed.
    
    Fixes #10760.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/nfs-server | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server
index 41055ad..15284e8 100644
--- a/src/initscripts/init.d/nfs-server
+++ b/src/initscripts/init.d/nfs-server
@@ -27,13 +27,9 @@ case "$1" in
 			loadproc /usr/sbin/rpc.rquotad
 		fi
 
-		# 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
-			evaluate_retval
-		fi
+		boot_mesg "Mounting nfsd virtual filesystem..."
+		/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
+		evaluate_retval
 
 		# Make ceratin that the list is refreshed on
 		# a restart.
@@ -62,13 +58,9 @@ case "$1" in
 		/usr/sbin/exportfs -au 2>&1 > /dev/null
 		evaluate_retval
 
-		# 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
-			evaluate_retval
-		fi
+		boot_mesg "Unmounting NFS Virtual Filesystem..."
+		/bin/umount /proc/fs/nfsd 2>&1 > /dev/null
+		evaluate_retval
 
 		# Remove a pid file that isn't done automatically
 		boot_mesg "Removing the rpc.statd pid file if it exists"


hooks/post-receive
--
IPFire 2.x development tree