X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F99-finish-grml-build;h=9f0ae402cc1292fe13b29f6575c63199e0713009;hb=69bd31ca5e652942465995e320b7852fc5cf2a06;hp=4d727bc40dc5d8623d6cb923cf3003d6ec016b37;hpb=bed0a7081d65b7e916678f2117d1b981f91843b9;p=grml-live.git 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 4d727bc..9f0ae40 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: Mon Oct 15 19:12:13 CEST 2007 [mika] +# Latest change: Mon Nov 12 11:15:56 CET 2007 [mika] ################################################################################ set -u @@ -13,7 +13,25 @@ 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#^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 fi # /etc/grml_cd makes the live system recognizable as a live system