Update /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build

diff --git a/debian/changelog b/debian/changelog
index e305472..a2e588f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ grml-live (0.0.8) unstable; urgency=low
   * Upgrade via aptitude [safe-]upgrade in update process.
   * Rename /etc/grml/fai/grml/grml_cleanup_chroot.no_online into
     /etc/grml/fai/grml/grml_cleanup_chroot.online
   * Upgrade via aptitude [safe-]upgrade in update process.
   * Rename /etc/grml/fai/grml/grml_cleanup_chroot.no_online into
     /etc/grml/fai/grml/grml_cleanup_chroot.online

+  * Edit /etc/apt/apt.conf inside
+    /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build only
+    once.

   * Purge removed packages via /etc/grml/fai/grml/grml_cleanup_chroot
   * Add new packages to GRML_FULL:
     - acx100-2.6.23-grml
   * Purge removed packages via /etc/grml/fai/grml/grml_cleanup_chroot
   * Add new packages to GRML_FULL:
     - acx100-2.6.23-grml

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 77ebe56..505abd1 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,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.
 # 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 Nov 04 11:20:55 CET 2007 [mika]
+# Latest change: Sun Nov 04 22:28:54 CET 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u


@@ -13,8 +13,8 @@ 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
 # 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
-   sed -i "s#APT::Install-Recommends.*#// &#"       $target/etc/apt/apt.conf
+   sed -i "s#^Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf
+   sed -i "s#^APT::Install-Recommends.*#// &#"       $target/etc/apt/apt.conf

 fi
 
 # Restore original state from softupdate:
 fi
 
 # Restore original state from softupdate: