From bddded93df88ad91d9ad8590950ce62a3b2e2e38 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 1 Nov 2007 16:21:03 +0100 Subject: [PATCH] Disable Recommends inside chroot installation --- debian/changelog | 1 + etc/grml/fai/config/hooks/instsoft.GRMLBASE | 5 ++++- etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ae3201..ab2d94e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ grml-live (0.0.7) unstable; urgency=low * Log executed grml-live command line. * Set FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info" by default. + * Disable Recommends inside chroot installation. * Use "newest" kernel only if two kernels are present in the chroot. * Set $SECONDS to unknown if $start_seconds is not set. * Log closing signs (----...) via bailout to make sure they are diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index f47a91d..063c929 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -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 Okt 29 23:35:34 CET 2007 [mika] +# Latest change: Thu Nov 01 16:18:38 CET 2007 [mika] ################################################################################ set -u @@ -35,6 +35,9 @@ else # no softupdate but fresh installation # should be removed later on: echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/apt/apt.conf +# Recommends just pull in way tooooo much packages, so disable it: +echo "APT::Install-Recommends "false"; // added by grml-live" >> $target/etc/apt/apt.conf + # install grml keys: gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \ gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787 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 bab5277..7b03524 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 Okt 29 10:46:02 CET 2007 [mika] +# Latest change: Thu Nov 01 16:19:52 CET 2007 [mika] ################################################################################ set -u @@ -14,8 +14,11 @@ set -e # 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 fi + + # remove an existing /etc/debian_chroot file: if [ -r $target/etc/debian_chroot ] ; then rm -f $target/etc/debian_chroot -- 2.1.4