Merge remote-tracking branch 'mfischer/python' into next

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / nfs-server

diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server
index 41055ad5b909a01d7584b6a003c4de56d75015ea..15284e88a36519e4d85220ae4cac8005535b2f6e 100644 (file)
--- 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"