nfs: Fixes for NFS server

[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..73378d501069f59607886e1f0b87fd70b835225b 100644 (file)
--- a/src/initscripts/init.d/nfs-server
+++ b/src/initscripts/init.d/nfs-server
@@ -13,6 +13,10 @@
 
 case "$1" in
        start)
+               boot_mesg "Mounting nfsd virtual filesystem..."
+                /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
+                evaluate_retval
+
                boot_mesg "Starting NFS mountd..."
                loadproc /usr/sbin/rpc.mountd
 
@@ -27,14 +31,6 @@ 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
-
                # Make ceratin that the list is refreshed on
                # a restart.
                boot_mesg "Exporting NFS Filesystems..."
@@ -47,8 +43,8 @@ case "$1" in
                killproc /usr/sbin/rpc.statd
 
                boot_mesg "Stopping NFS nfsd..."
-               # nfsd needs HUP....
-               killproc nfsd HUP
+               /usr/sbin/rpc.nfsd 0
+               evaluate_retval
 
                boot_mesg "Stopping NFS mountd..."
                killproc /usr/sbin/rpc.mountd
@@ -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"