X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=33d9b73e2baa52172b66d991ebdaa6e8d1ba7834;hp=8d8c62697ada68529536b12007909c3cbd221798;hb=b68164e384f6c7d682212995fc96ab919a2677f0;hpb=02b32aa7fe4022fdefc80552539ecba4f1067492

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..33d9b73 100755
--- 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,37 @@
 # 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: Sun Dec 16 18:33:15 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
+   sed -i "s#^Aptitude::Recommends-Important.*#// &#" $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
+fi
+
 # /etc/grml_cd makes the live system recognizable as a live system
 touch $target/etc/grml_cd