Delete extraneous stuff.
This commit is contained in:
parent
0970c63e3d
commit
c628fe89be
28
cgroup.diff
28
cgroup.diff
@ -1,28 +0,0 @@
|
|||||||
commit af1d17f1d3e213e41d9b320b5e2251118d463bd3
|
|
||||||
Author: Bill Nottingham <notting@redhat.com>
|
|
||||||
Date: Thu Aug 26 13:25:36 2010 -0400
|
|
||||||
|
|
||||||
Fix umount on halt for new cgroup location. (#612789)
|
|
||||||
|
|
||||||
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
|
|
||||||
index a19c76f..cb33cbe 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
|
|
@ -1,22 +0,0 @@
|
|||||||
From 677fbac75b7517a4e20a65d555e3d33c37af79a4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bill Nottingham <notting@redhat.com>
|
|
||||||
Date: Mon, 2 Aug 2010 12:43:38 -0400
|
|
||||||
Subject: [PATCH] exit with a zero return code. (#605519)
|
|
||||||
|
|
||||||
---
|
|
||||||
rc.d/init.d/killall | 1 +
|
|
||||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall
|
|
||||||
index c1169b1..e4e08bd 100755
|
|
||||||
--- a/rc.d/init.d/killall
|
|
||||||
+++ b/rc.d/init.d/killall
|
|
||||||
@@ -32,3 +32,4 @@ for i in /var/lock/subsys/* ; do
|
|
||||||
rm -f "$i"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
+exit 0
|
|
||||||
--
|
|
||||||
1.5.5.6
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user