diff -u libcgroup-0.34/debian/changelog libcgroup-0.34/debian/changelog
--- libcgroup-0.34/debian/changelog
+++ libcgroup-0.34/debian/changelog
@@ -1,3 +1,12 @@
+libcgroup (0.34-0ubuntu3) lucid-proposed; urgency=low
+
+  * debian/patches/cgred-initscript-2.diff  (LP: #825598)
+    - source /etc/deafult/cgred, not cgred.conf
+    - pull DAEMON_OPTS from defaults file into init script
+    - --log-file is not a valid option.  -f or --logfile is.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 15 Aug 2011 13:47:54 -0500
+
 libcgroup (0.34-0ubuntu2) karmic; urgency=low
 
   * debian/copyright: update to be more thorough
diff -u libcgroup-0.34/debian/patches/series libcgroup-0.34/debian/patches/series
--- libcgroup-0.34/debian/patches/series
+++ libcgroup-0.34/debian/patches/series
@@ -6,0 +7 @@
+cgred-initscript-2.diff
only in patch2:
unchanged:
--- libcgroup-0.34.orig/debian/patches/cgred-initscript-2.diff
+++ libcgroup-0.34/debian/patches/cgred-initscript-2.diff
@@ -0,0 +1,27 @@
+Description: Fix 3 bugs in cgred init script
+ 1. source /etc/deafult/cgred, not cgred.conf
+ 2. pull DAEMON_OPTS from defaults file into init script
+ 3. --log-file is not a valid option.  -f or --logfile is.
+Author: Serge Hallyn <serge.hallyn@canonical.com>
+Forwarded: no
+
+Index: libcgroup-0.34/scripts/init.d/cgred.in
+===================================================================
+--- libcgroup-0.34.orig/scripts/init.d/cgred.in	2011-08-15 14:05:58.706372701 -0500
++++ libcgroup-0.34/scripts/init.d/cgred.in	2011-08-15 14:06:34.406373510 -0500
+@@ -44,11 +44,11 @@
+ . /lib/lsb/init-functions
+ 
+ # Read in configuration options.
+-if [ -f "/etc/default/cgred.conf" ] ; then
+-	. /etc/default/cgred.conf
+-	OPTIONS="$NODAEMON $LOG"
++if [ -f "/etc/default/cgred" ] ; then
++	. /etc/default/cgred
++	OPTIONS="$DAEMON_OPTS $NODAEMON $LOG"
+ 	if [ -n "$LOG_FILE" ]; then
+-		OPTIONS="$OPTIONS --log-file=$LOG_FILE"
++		OPTIONS="$OPTIONS -f $LOG_FILE"
+ 	fi
+ else
+ 	OPTIONS=""