# 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 Okt 29 10:46:02 CET 2007 [mika]
+# Latest change: Sun Dec 16 18:33:15 CET 2007 [mika]
################################################################################
set -u
# 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#^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: