From 842261ee6fc9d8e3f2f9339b22efdc8328d7b8d1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 27 Jan 2004 20:24:12 +0000
Subject: NFSv4 support (<chucklever@bigfoot.com>, <steved@redhat.com>)

---
 rc.d/init.d/netfs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'rc.d/init.d/netfs')

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 204e262b..2523e8ff 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -19,11 +19,11 @@
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit 0
 
-NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "nfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
+NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $4 !~ /noauto/ { print $2 }' /etc/fstab`
 SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
 NCPFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "ncpfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
 NETDEVMTAB=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" { print $2 }' /proc/mounts`
-NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 == "nfs" && $2 != "/" { print $2 }' /proc/mounts`
+NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" { print $2 }' /proc/mounts`
 SMBMTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" { print $2 }' /proc/mounts`
 NCPMTAB=`LC_ALL=C awk '!/^#/ && $3 == "ncpfs" { print $2 }' /proc/mounts`
 
@@ -33,12 +33,12 @@ case "$1" in
         [ -n "$NFSFSTAB" ] && 
 	  {
 	    [ ! -f /var/lock/subsys/portmap ] && service portmap start
-	    action $"Mounting NFS filesystems: " mount -a -t nfs
+	    action $"Mounting NFS filesystems: " mount -a -t nfs,nfs4
 	  }
         [ -n "$SMBFSTAB" ] && action $"Mounting SMB filesystems: " mount -a -t smbfs
         [ -n "$NCPFSTAB" ] && action $"Mounting NCP filesystems: " mount -a -t ncpfs
 	touch /var/lock/subsys/netfs
-	action $"Mounting other filesystems: " mount -a -t nonfs,smbfs,ncpfs
+	action $"Mounting other filesystems: " mount -a -t nonfs,nonfs4,smbfs,ncpfs
 	;;
   stop)
         # Unmount loopback stuff first
@@ -94,9 +94,9 @@ case "$1" in
 		while [ -n "$remaining" -a "$retry" -gt 0 ]
 		do
 			if [ "$retry" -lt 3 ]; then
-				action $"Unmounting NFS filesystems (retry): " umount -f -l -a -t nfs
+				action $"Unmounting NFS filesystems (retry): " umount -f -l -a -t nfs,nfs4
 			else
-				action $"Unmounting NFS filesystems: " umount -f -l -a -t nfs
+				action $"Unmounting NFS filesystems: " umount -f -l -a -t nfs,nfs4
 			fi
 			sleep 2
 			remaining=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts`
-- 
cgit v1.2.1