- replace hardcoded regexp (/|/usr) with a variable

[packages/nfs-utils.git] / nfsfs.init

diff --git a/nfsfs.init b/nfsfs.init
index 8eaf7a9005edbc2e173a477e9bbe14021386f766..46961a0d6c80419d4cf0e42f71b1e3ccc4256fbb 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -2,15 +2,9 @@
 #
 # nfsfs                Mount NFS filesystems.
 #
-# Version:     @(#) /etc/init.d/skeleton 1.01 26-Oct-1993
-#
-# Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
-#
-# chkconfig:   345 15 83
+# chkconfig:   345 16 80
 # description: Mounts and unmounts all Network File System (NFS) \
 #              mount points.
-#
-# $Id$
 
 # Source networking configuration.
 if [ ! -f /etc/sysconfig/network ]; then
@@ -37,18 +31,16 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
+fi
+
+if [ -z "$NFSUMOUNT_IGNORE" ]; then
+       NFSUMOUNT_IGNORE="/ /usr"
 fi
 
 start() {
        if [ ! -f /var/lock/subsys/nfsfs ]; then
-               if ! grep -q rpc_pipefs /proc/mounts ; then
-                       modprobe -s sunrpc > /dev/null 2>&1
-                       run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
-                               mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-               fi
-
                # Set the ports lockd should listen on
                if [ -n "$LOCKD_TCPPORT" ]; then
                        /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
@@ -84,13 +76,25 @@ stop() {
        show "Unmounting NFS filesystems"
        busy
        retry=3
-       remaining=$(awk '$3 ~ /^nfs(4$|$)/ {print $2}' $fsfile)
+       remaining=$(awk -v ig="^($NFSUMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
+                       $3 ~ /^nfs(4$|$)/ && $2 !~ ig {print $2}' $fsfile)
        while [ -n "$remaining" -a $retry -gt 0 ]; do
-               fuser -msk -TERM `awk '$3 ~ /^nfs(4$|$)/ {print $2}' < $fsfile`
+               fuser -msk -TERM `awk -v ig="^($NFSUMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
+                                       $3 ~ /^nfs(4$|$)/ && $2 !~ ig {print $2}' < $fsfile`
                sleep 2
-               fuser -msk -KILL `awk '$3 ~ /^nfs(4$|$)/ {print $2}' < $fsfile`
-               umount -a -f -t nfs,nfs4
-               remaining=$(awk '$3 ~ /^nfs(4$|$)/ {print $2}' $fsfile)
+               fuser -msk -KILL `awk -v ig="^($NFSUMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
+                                       $3 ~ /^nfs(4$|$)/ && $2 !~ ig {print $2}' < $fsfile`
+               # Sort filesystems to unmount in reverse order
+               rem=""
+               for r in $(`awk -v ig="^($NFSUMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
+                               $3 ~ /^nfs(4$|$)/ && $2 !~ ig {print $2}' $fsfile) ; do
+                       rem="$r $rem"
+               done
+               for fs in $rem ; do
+                       umount $fs
+               done
+               remaining=$(awk -v ig="^($NFSUMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
+                               $3 ~ /^nfs(4$|$)/ && $2 !~ ig {print $2}' $fsfile)
                retry=$(($retry-1))
        done
        ok