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=b4078be6135f15b029e3ac06b433134360223a3a;hp=77ebe56f234bc57b74c969f6387092b32b28e662;hb=acc4adfadf97aa83811c9bf8cd3ef52a5de985c8;hpb=9838a1360e0675cc06ef853848d42793c51e3701 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..b4078be 100755 --- 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 # 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: Sat Apr 12 21:35:01 CEST 2008 [mika] ################################################################################ set -u @@ -13,8 +13,10 @@ 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#^Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf + sed -i "s#^APT::Install-Recommends.*#// &#" $target/etc/apt/apt.conf + # Notice: deprecated since aptitude (0.4.11-1): + sed -i "s#^Aptitude::Recommends-Important.*#// &#" $target/etc/apt/apt.conf fi # Restore original state from softupdate: @@ -22,6 +24,13 @@ 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