aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-05-09 12:36:45 -0400
committerHarald Hoyer <harald@redhat.com>2011-06-01 14:14:58 +0200
commit19025a6bb0782093868c0c8e1bf471e1abcdc47f (patch)
treebce3d43e161247abcbaf902ea924477c44c073fd
parent56f816708a77f7ac2789efe554de570e35978119 (diff)
downloadinitscripts-19025a6bb0782093868c0c8e1bf471e1abcdc47f.tar
initscripts-19025a6bb0782093868c0c8e1bf471e1abcdc47f.tar.gz
initscripts-19025a6bb0782093868c0c8e1bf471e1abcdc47f.tar.bz2
initscripts-19025a6bb0782093868c0c8e1bf471e1abcdc47f.tar.xz
initscripts-19025a6bb0782093868c0c8e1bf471e1abcdc47f.zip
don't match filesystem types in hostnames (#703203, <jmueller@data-tronics.com>)
-rwxr-xr-xrc.d/init.d/halt3
1 files changed, 2 insertions, 1 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 45c69113..ceca313a 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -165,7 +165,8 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \
LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next}
$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
- /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next}
+ $3 ~ /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs)/ {next}
+ /(^none|^\/dev\/ram|^\/dev\/root$)/ {next}
{print $2}' /proc/mounts \
$"Unmounting file systems: " \
$"Unmounting file systems (retry): " \