From 30948a3822371774d8794bd5c78c852b81d5b155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Tue, 22 Jun 2010 12:34:57 +0000 Subject: [PATCH] rediff the patch... --- fedora-fix-initscripts.patch | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/fedora-fix-initscripts.patch b/fedora-fix-initscripts.patch index 6812405..e2897e1 100644 --- a/fedora-fix-initscripts.patch +++ b/fedora-fix-initscripts.patch @@ -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 ---- - - 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