aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-05-09 12:36:45 -0400
committerPetr Lautrbach <plautrba@redhat.com>2011-08-15 10:12:38 +0200
commit7625e7606e133da1c0a1c10c1cc4508c5d3cac1f (patch)
treef915e96be9e0fd7e6d8c1d80999c1f87b0bc9307
parent20b4c9356342ce1f57857e0a2103a431087be975 (diff)
downloadinitscripts-7625e7606e133da1c0a1c10c1cc4508c5d3cac1f.tar
initscripts-7625e7606e133da1c0a1c10c1cc4508c5d3cac1f.tar.gz
initscripts-7625e7606e133da1c0a1c10c1cc4508c5d3cac1f.tar.bz2
initscripts-7625e7606e133da1c0a1c10c1cc4508c5d3cac1f.tar.xz
initscripts-7625e7606e133da1c0a1c10c1cc4508c5d3cac1f.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 b07776ea..45e37505 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|^\/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): " \