rediff the patch...

This commit is contained in:
Jan Šafránek 2010-06-22 12:34:57 +00:00
parent 1ba06b586c
commit 30948a3822

View File

@ -3,18 +3,10 @@ we do not care about (like X11, QT, ...). We want libcgroup to be able to
run without this bloat.
From: Jan Safranek <jsafrane@redhat.com>
---
scripts/init.d/cgconfig.in | 11 ++++++++++-
scripts/init.d/cgred.in | 10 +++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index 543cb9f..80df311 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -46,7 +46,16 @@ servicename=cgconfig
diff -up libcgroup-0.36.2/scripts/init.d/cgconfig.in.lsb libcgroup-0.36.2/scripts/init.d/cgconfig.in
--- libcgroup-0.36.2/scripts/init.d/cgconfig.in.lsb 2010-03-11 13:05:16.000000000 +0100
+++ libcgroup-0.36.2/scripts/init.d/cgconfig.in 2010-06-22 14:33:43.000000000 +0200
@@ -44,7 +44,16 @@ servicename=cgconfig
#
# Source LSB routines
#
@ -30,12 +22,11 @@ index 543cb9f..80df311 100644
+ echo -n $*; warning "$*"; echo
+}
parse_mounts() {
while read name mountpt fs opts other
diff --git a/scripts/init.d/cgred.in b/scripts/init.d/cgred.in
index db9c2ac..e810d5b 100644
--- a/scripts/init.d/cgred.in
+++ b/scripts/init.d/cgred.in
# read the config
CREATE_DEFAULT=yes
diff -up libcgroup-0.36.2/scripts/init.d/cgred.in.lsb libcgroup-0.36.2/scripts/init.d/cgred.in
--- libcgroup-0.36.2/scripts/init.d/cgred.in.lsb 2010-01-17 00:27:36.000000000 +0100
+++ libcgroup-0.36.2/scripts/init.d/cgred.in 2010-06-22 14:33:43.000000000 +0200
@@ -40,7 +40,15 @@ CGRED_BIN=$sbindir/cgrulesengd
# Source function library & LSB routines