This is another in Martin Blapp's N-series of mount-related cleanups :)

Changes are:
 - rpc.umntall is called at the right places now in /etc/rc*
 - rpc.umntall timeout has been lowered from two days (too high) to one
 - verbose messages in rpc.umntall have been clarified
 - kill double entries in /var/db/mounttab when rpc.umntall is invoked
 - ${early_nfs_mounts} has been removed from /etc/rc
 - patched mount(8) -p to print different pass/dump values for ufs filesystems.
   (last patch recieved from dan <bugg@bugg.strangled.net>)

Submitted by:	Martin Blapp <mbr@imp.ch>, dan <bugg@bugg.strangled.net>

1 files changed, 4 insertions, 38 deletions

diff --git a/etc/rc b/etc/rc
index 33ed91a..ac5a2c3 100644
--- a/etc/rc
+++ b/etc/rc
@@ -113,23 +113,8 @@ esac
 
 umount -a >/dev/null 2>&1
 
-# Early NFS mounts and clean up of /var/db/mounttab.
-#
-case ${early_nfs_mounts} in
-[Yy][Ee][Ss])
-	case $1 in
-	autoboot)
-		if [ -f /var/db/mounttab ]; then
-			rpc.umntall -k
-		fi
-		;;
-	esac
-	mount -a
-	;;
-*)
-	mount -a -t nonfs
-	;;
-esac
+# Mount everything except nfs filesystems.
+mount -a -t nonfs
 
 case $? in
 0)
@@ -206,28 +191,9 @@ if [ -r /etc/rc.network ]; then
 	network_pass1
 fi
 
-# Only mount NFS file systems if $early_nfs_mounts is false.
-# If there is a /var/db/mounttab, clean it up with rpc.umntall.
-#
+# Mount NFS filesystems.
 echo -n "Mounting NFS file systems"
-case ${early_nfs_mounts} in
-[Yy][Ee][Ss])
-	;;
-*)
-	case $1 in
-	autoboot)
-		case ${nfs_client_enable} in
-		[Yy][Ee][Ss])
-			if [ -f /var/db/mounttab ]; then
-				rpc.umntall -k
-			fi
-			;;
-		esac
-		;;
-	esac
-	mount -a -t nfs
-	;;
-esac
+mount -a -t nfs
 echo .
 
 # Whack the pty perms back into shape.