- Added $CONFIGUREDNFSMOUNTPOINTS and $ACTIVENFSMOUNTPOINTS

- Added checking for configured NFS mountpoints in start)
- Added checking for configured and active NFS mountpoints in stop)
- Simplified status)
- I think reload) is stupid and someone should throw it out because it doesn't work ;)

Changed files:
    nfsfs.init -> 1.6

diff --git a/nfsfs.init b/nfsfs.init
index 6a10999a47285fb0b3f4549207f4b794393331bb..b63056213582221d667e0738979f23b0157dc188 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -28,15 +28,24 @@ if is_no "${NETWORKING}"; then
        exit 1
 fi
 
+CONFIGUREDNFSMOUNTPOINTS="`grep -v '^#' /etc/fstab | \
+    awk '{ if ($3 ~ /^nfs$/ && $4 !~ /noauto/) print $2}'`"
+ACTIVENFSMOUNTPOINTS="`grep -v '^#' /proc/mounts | \
+    awk '{ if ($3 ~ /^nfs$/ && $4 !~ /noauto/) print $2}'`"
+
 # See how we were called.
 case "$1" in
   start)
+       if [ -z "$CONFIGUREDNFSMOUNTPOINTS" ] ; then
+               echo "There are no configured NFS mountpoints!"
+       else
        show "Mounting NFS filesystems"
        busy
        mount -a -t nfs
        deltext
        ok
        touch /var/lock/subsys/nfsfs
+       fi
        ;;
   stop)
        if [ -f /proc/mounts ] ; then
@@ -44,6 +53,12 @@ case "$1" in
        else
                fsfile="/etc/mtab"
        fi
+                       
+       if [ -z "$CONFIGUREDNFSMOUNTPOINTS" ] ; then
+               echo "There are no configured NFS mountpoints!"
+       elif [ -z "$ACTIVENFSMOUNTPOINTS" ] ; then
+               echo "There are no active NFS mountpoints!"
+       else
 
        show "Unmounting NFS filesystems"
        busy
@@ -54,15 +69,14 @@ case "$1" in
        deltext
        ok
        rm -f /var/lock/subsys/nfsfs
+       fi
        ;;
   status)
        if [ -f /proc/mounts ] ; then
                echo "Configured NFS mountpoints:"
-               grep -v '^#' /etc/fstab | \
-                 awk '{ if ($3 ~ /^nfs$/ && $4 !~ /noauto/) print $2}'
+               echo "$CONFIGUREDNFSMOUNTPOINTS"
                echo "Active NFS mountpoints:"
-               grep -v '^#' /proc/mounts | \
-                 awk '{ if ($3 ~ /^nfs$/ && $4 !~ /noauto/) print $2}'
+               echo "$ACTIVENFSMOUNTPOINTS"
        else
                echo "/proc filesystem unavailable"
        fi