X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=0f1b9d6d4fbfbed83fbfaa7fb8fa6026187a567f;hp=9f0ae402cc1292fe13b29f6575c63199e0713009;hb=7cf0d67457c7a730a4cbdec28f7f9bdcd180a361;hpb=69bd31ca5e652942465995e320b7852fc5cf2a06

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 9f0ae40..0f1b9d6 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -1,34 +1,19 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/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: Mon Nov 12 11:15:56 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 original state from softupdate:
 if [ -r $target/etc/policy-rc.d.conf ] ; then
    sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
 fi
 
-# Restore usual behaviour:
-if [ -r $target/etc/kernel-img.conf ] ; then
-   if grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then
-      sed -i "s/silent_modules = Yes/# &/" $target/etc/kernel-img.conf
-   fi
-fi
-
 # remove an existing /etc/debian_chroot file:
 if [ -r $target/etc/debian_chroot ] ; then
    rm -f $target/etc/debian_chroot
@@ -38,4 +23,4 @@ fi
 touch $target/etc/grml_cd
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2