Rework apt.conf handling in instsoft/updatebase (provide /etc/apt/apt.conf.d/15grml...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 99-finish-grml-build

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..da74934 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -1,21 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
 # Purpose:       finalize grml chroot build
 # 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]
 ################################################################################
 
 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
-   sed -i "s#APT::Install-Recommends.*#// &#"       $target/etc/apt/apt.conf
-fi
+# Restore usual Debian behaviour
+#if [ -r "$target"/etc/apt/apt.conf.d/15grml-live ] ; then
+#   rm -f "$target"/etc/apt/apt.conf.d/15grml-live
+#fi
 
 # Restore original state from softupdate:
 if [ -r $target/etc/policy-rc.d.conf ] ; then