aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-02-09 20:35:42 +0000
committerBill Nottingham <notting@redhat.com>2005-02-09 20:35:42 +0000
commit85f1cebf94b11d2caa0efb3334e6c6fc25780d62 (patch)
tree5376d630b81da0492235682a82236860d39f589a
parent35b0eeb4279c8f33a4beda2cbae45e4c127af7f1 (diff)
downloadinitscripts-85f1cebf94b11d2caa0efb3334e6c6fc25780d62.tar
initscripts-85f1cebf94b11d2caa0efb3334e6c6fc25780d62.tar.gz
initscripts-85f1cebf94b11d2caa0efb3334e6c6fc25780d62.tar.bz2
initscripts-85f1cebf94b11d2caa0efb3334e6c6fc25780d62.tar.xz
initscripts-85f1cebf94b11d2caa0efb3334e6c6fc25780d62.zip
fix _netdev unmounting (#147610, <alewis@redhat.com>)
-rwxr-xr-xrc.d/init.d/netfs6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 99cceb3b..b64c06b6 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -23,7 +23,7 @@ NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ {
SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
CIFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" && $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`
+NETDEVMTAB=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab`
NFSMTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" { print $2 }' /proc/mounts`
SMBMTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" { print $2 }' /proc/mounts`
CIFSMTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" { print $2 }' /proc/mounts`
@@ -73,7 +73,7 @@ case "$1" in
[ -n "$NETDEVMTAB" ] && {
sig=
retry=3
- remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /proc/mounts`
+ remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /etc/mtab`
while [ -n "$remaining" -a "$retry" -gt 0 ]
do
if [ "$retry" -lt 3 ]; then
@@ -82,7 +82,7 @@ case "$1" in
action $"Unmounting network block filesystems: " umount -a -O _netdev
fi
sleep 2
- remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /proc/mounts`
+ remaining=`LC_ALL=C awk '!/^#/ && $4 ~ /_netdev/ && $2 != "/" {print $2}' /etc/mtab`
[ -z "$remaining" ] && break
/sbin/fuser -k -m $sig $remaining >/dev/null
sleep 5