aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-05-09 12:36:45 -0400
committerBill Nottingham <notting@redhat.com>2011-05-09 12:36:45 -0400
commita8295afa615410bfef2df178ab8764cdc25bf2e0 (patch)
tree8fdbde6c37f869679f1b837ba5b5365e3387bf96
parent046a3ba411cc66eefcfe7d9a598e7960784e18e9 (diff)
downloadinitscripts-a8295afa615410bfef2df178ab8764cdc25bf2e0.tar
initscripts-a8295afa615410bfef2df178ab8764cdc25bf2e0.tar.gz
initscripts-a8295afa615410bfef2df178ab8764cdc25bf2e0.tar.bz2
initscripts-a8295afa615410bfef2df178ab8764cdc25bf2e0.tar.xz
initscripts-a8295afa615410bfef2df178ab8764cdc25bf2e0.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 cb33cbed..267a7c83 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -140,7 +140,8 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \
LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/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): " \