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=8d8c62697ada68529536b12007909c3cbd221798;hb=acc4adfadf97aa83811c9bf8cd3ef52a5de985c8;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..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,12 +4,38 @@ # 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 Sep 16 23:04:36 CEST 2007 [mika] +# Latest change: Sat Apr 12 21:35:01 CEST 2008 [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 + # 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: +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