aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec4
-rwxr-xr-xrc.d/init.d/netfs4
2 files changed, 4 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec
index ab44b282..17f0a98d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -12,11 +12,11 @@ Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
Requires: /sbin/sysctl, sysklogd >= 1.3.31
Requires: setup >= 2.0.3, /sbin/fuser, which, /bin/grep
Requires: modutils >= 2.3.11-5
-Requires: util-linux >= 2.10s-11, mount >= 2.11g-5
+Requires: util-linux >= 2.10s-11, mount >= 2.11l
Requires: bash >= 2.0, SysVinit
Requires: /sbin/ip, /sbin/arping, net-tools
Requires: /sbin/update, /etc/redhat-release
-Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
+Conflicts: kernel <= 2.4.11, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Obsoletes: rhsound sapinit
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 15ea6580..1fff48ce 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -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 -a -t nfs
+ action $"Unmounting NFS filesystems (retry): " umount -f -l -a -t nfs
else
- action $"Unmounting NFS filesystems: " umount -f -a -t nfs
+ action $"Unmounting NFS filesystems: " umount -f -l -a -t nfs
fi
sleep 2
remaining=`awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts`