diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-07-27 13:56:03 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-07-27 13:56:03 -0400 |
| commit | 49f8dfb872b73e2cade08ca1156c65f81c47910a (patch) | |
| tree | dfe834a599bc869c6442f9d614a11ce7b3db2e66 /rc.d/init.d | |
| parent | 7c02171fc48aa5dcac7f18608ac33acce2b2d6a2 (diff) | |
| download | initscripts-49f8dfb872b73e2cade08ca1156c65f81c47910a.tar initscripts-49f8dfb872b73e2cade08ca1156c65f81c47910a.tar.gz initscripts-49f8dfb872b73e2cade08ca1156c65f81c47910a.tar.bz2 initscripts-49f8dfb872b73e2cade08ca1156c65f81c47910a.tar.xz initscripts-49f8dfb872b73e2cade08ca1156c65f81c47910a.zip | |
Don't umount cgroup stuff on halt (#612789)
Diffstat (limited to 'rc.d/init.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 23eaca80..05e3d460 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|^\/dev/{next} +LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/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|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \ +awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \ /proc/mounts | sort -r | \ while read line; do fstab-decode $UMOUNT -f $line |