From af1d17f1d3e213e41d9b320b5e2251118d463bd3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 26 Aug 2010 13:25:36 -0400
Subject: Fix umount on halt for new cgroup location. (#612789)

---
 rc.d/init.d/halt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index a19c76f6..cb33cbed 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \
     $"Unmounting pipe file systems (retry): " \
     -f
 
-LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/dev/{next}
+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}
 	{print $2}' /proc/mounts \
@@ -155,7 +155,7 @@ rm -f /.autofsck
 
 # Try all file systems other than root, essential filesystems and RAM disks,
 # one last time.
-awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \
+awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' \
     /proc/mounts | sort -r | \
   while read line; do
     fstab-decode $UMOUNT -f $line
-- 
cgit v1.2.1