From 961a5ebdae6d44584eba0d413f6541838865aead Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 27 Aug 2009 00:00:58 +0200 Subject: [PATCH] Temporarly move /etc/apt/sources.list.d/grml.list in instsoft.GRMLBASE --- debian/changelog | 6 +++++- etc/grml/fai/config/hooks/instsoft.GRMLBASE | 3 +++ etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 60de6b1..3cff90b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,12 @@ grml-live (0.9.22) UNRELEASED; urgency=low * Always remove temporary squashfs stderr file. * Fix usage of /etc/runlevel.conf in 15-initsetup. * Add wicd configuration to /etc/grml/fai/config/debconf/GRMLBASE. + * Temporarly move /etc/apt/sources.list.d/grml.list in instsoft.GRMLBASE + to /etc/apt/sources.list.d/grml.unused and restore in 33-aptsetup + again then. This should should prevent us from duplicated sources + list entries. - -- Michael Prokop Wed, 26 Aug 2009 23:46:14 +0200 + -- Michael Prokop Wed, 26 Aug 2009 23:59:14 +0200 grml-live (0.9.21) unstable; urgency=low diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index a678e38..df99f5b 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -58,6 +58,9 @@ EOF rm $target/etc/apt/sources.list fi cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list + if [ -r $target/etc/apt/sources.list.d/grml.list ] ; then + mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused + fi fi # run it on our own, as updatebase is used at the wrong stage for our needs, diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index a35de27..9e4df63 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -11,6 +11,11 @@ set -e # remove leftover from /etc/grml/fai/config/hooks/instsoft.GRMLBASE: rm -f $target/etc/apt/sources.list.d/grml-live.list +# restore original grml sources.list file: +if [ -r $target/etc/apt/sources.list.d/grml.unused ] ; then + mv $target/etc/apt/sources.list.d/grml.unused $target/etc/apt/sources.list.d/grml.list +fi + GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list" DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list" -- 2.1.4