From 7cbe19913e865b9828d220a698e5b208a32c7348 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 17 Jul 2001 16:13:22 +0000
Subject: use -O nonetdev; require new mount package

---
 initscripts.spec  | 2 +-
 rc.d/init.d/netfs | 1 +
 rc.d/rc.sysinit   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index dc4902ce..5582d5c3 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -11,7 +11,7 @@ Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: procps >= 2.0.7-7, sysklogd >= 1.3.31
 Requires: setup >= 2.0.3, /sbin/fuser, which
 Requires: modutils >= 2.3.11-5
-Requires: util-linux >= 2.10s-11, mount >= 2.10r-5
+Requires: util-linux >= 2.10s-11, mount >= 2.11g-4
 Requires: bash >= 2.0
 Requires: /sbin/ip, /sbin/arping
 Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 2f3c1c1f..ba5a0eb1 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -63,6 +63,7 @@ case "$1" in
 			sig=-9
 		done
 	}
+	action $"Unmounting network block filesystems: " umount -a -O netdev
   	[ -n "$NFSMTAB" ] && {
 		sig=
 		retry=3
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 153c5b44..64cb7911 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -531,7 +531,7 @@ fi
 # Mount all other filesystems (except for NFS and /proc, which is already
 # mounted). Contrary to standard usage,
 # filesystems are NOT unmounted in single user mode.
-action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs
+action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs -O nonetdev
 
 if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then
 	if [ -x /sbin/convertquota ]; then
-- 
cgit v1.2.1