Improve Acquire::http::Pipeline-Depth solution

diff --git a/debian/changelog b/debian/changelog
index 69483ce..77b3f88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ grml-live (0.0.5) unstable; urgency=low
     - grml-live_autobuild_grml64-small_sid.sh
   * Some more FAI error checking.
   * Updated buildd scripts (better subject handling).
-  * Re-enable 'Acquire::http::Pipeline-Depth' workaround'
+  * Re-enable 'Acquire::http::Pipeline-Depth' workaround'.
+    Restore usual Debian behaviour at the end using
+    /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
   * Add new scripts for retreiving bugs via apt-listbugs
     and storing package selection inside log directory.
     This has been integrated in a new class named "RELEASE".

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 404f1eb..2fe8bd8 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sat Oct 13 23:18:56 CEST 2007 [mika]
+# Latest change: Mon Oct 15 19:12:33 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -12,7 +12,7 @@ set -e
 
 # work around http://trac.lighttpd.net/trac/ticket/657
 # should be removed later on:
-echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf
+echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/apt/apt.conf
 
 # install grml keys:
 gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
index 8d8c626..4d727bc 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -4,12 +4,18 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Sep 16 23:04:36 CEST 2007 [mika]
+# Latest change: Mon Oct 15 19:12:13 CEST 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
+# Restore usual Debian behaviour which has been changed
+# for FAI via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
+if [ -r $target/etc/apt/apt.conf ] ; then
+   sed -i "s#Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf
+fi
+
 # /etc/grml_cd makes the live system recognizable as a live system
 touch $target/etc/grml_cd