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 15:23:34 +0200
commit35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff (patch)
treebce3d43e161247abcbaf902ea924477c44c073fd
parent877cee95895fa2192aa66e5cb555de587af46dea (diff)
downloadinitscripts-35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff.tar
initscripts-35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff.tar.gz
initscripts-35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff.tar.bz2
initscripts-35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff.tar.xz
initscripts-35a0f1ba2f18115d71b910fd6bd1f5c2f9c3c2ff.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): " \