diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-08-26 13:25:36 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-08-26 13:25:36 -0400 |
| commit | af1d17f1d3e213e41d9b320b5e2251118d463bd3 (patch) | |
| tree | 916a544ed137a6ce9b2700daef5bf1cf198fea1a /rc.d | |
| parent | a60778107da3c93948cad93d71a883c38d406922 (diff) | |
| download | initscripts-af1d17f1d3e213e41d9b320b5e2251118d463bd3.tar initscripts-af1d17f1d3e213e41d9b320b5e2251118d463bd3.tar.gz initscripts-af1d17f1d3e213e41d9b320b5e2251118d463bd3.tar.bz2 initscripts-af1d17f1d3e213e41d9b320b5e2251118d463bd3.tar.xz initscripts-af1d17f1d3e213e41d9b320b5e2251118d463bd3.zip | |
Fix umount on halt for new cgroup location. (#612789)
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/halt | 4 |
1 files changed, 2 insertions, 2 deletions
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 |