From d10bf16996ce52adfe8bfd33b8ed60007f44e191 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 24 Oct 2007 14:32:47 +0200 Subject: [PATCH] Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE --- debian/changelog | 2 ++ etc/grml/fai/config/hooks/instsoft.GRMLBASE | 7 ++++++- etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d97c97..3bfa6ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ grml-live (0.0.7) unstable; urgency=low during grml-live execution * Added new grml-repository named grml-live which is intented to fix issues from Debian for grml-live builds. + * Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE + already and remove it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup * Display version number of grml-live. * Log executed grml-live command line. * Set FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info" diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index f3cf9ec..cdca8a8 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: Thu Oct 18 14:18:44 CEST 2007 [mika] +# Latest change: Mit Okt 24 14:30:53 CEST 2007 [mika] ################################################################################ set -u @@ -20,6 +20,11 @@ gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787 gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key $ROOTCMD apt-key add /etc/apt/grml.key +# make sure we prefer grml repository: +if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then + cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences +fi + # make sure we have file-rc available before # package_config/GRML is being executed: $ROOTCMD apt-get update diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index 0edf2f2..2ccff06 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -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 Sep 16 23:10:06 CEST 2007 [mika] +# Latest change: Mit Okt 24 14:30:39 CEST 2007 [mika] ################################################################################ set -u @@ -14,9 +14,9 @@ rm -f $target/etc/apt/sources.list $ROOTCMD ln -s /etc/apt/sources.list.grml /etc/apt/sources.list -if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then - cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences -fi +#if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then +# cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences +#fi ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 -- 2.1.4