From 08d8db7511b78113edfb8ef04a40706315fd73a7 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 14 Nov 2009 12:49:14 +0100 Subject: [PATCH] Update sources.list handling. --- debian/changelog | 11 +++++++++-- docs/grml-live.txt | 4 ++-- etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 20 ++++++++++++++++---- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e8f41b..0c44b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,15 @@ grml-live (0.9.33) UNRELEASED; urgency=low configuration instead * Integrate /etc/grml/fai/config/scripts/GRMLBASE/01-packages which is meant to be used as package installation validator. - - -- Michael Prokop Sat, 14 Nov 2009 12:38:04 +0100 + * Update sources.list handling: + - Disable deb-src by default in sources.list. People usually + won't need this and the ones that want it know how to enable + it. Therefore let's save traffic on the mirrors. + - Note usage of GeoIP-selected mirrors. + - Add commented examples for DE/AT mirrors. + Thanks for the suggestions to Sedat Dilek. [Closes: issue756] + + -- Michael Prokop Sat, 14 Nov 2009 12:46:22 +0100 grml-live (0.9.32) unstable; urgency=low diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 0cf9f3b..a6bb442 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -664,11 +664,11 @@ Instructions # grml stable repository: deb http://deb.grml.org/ grml-stable main - deb-src http://deb.grml.org/ grml-stable main + # deb-src http://deb.grml.org/ grml-stable main # grml testing/development repository: deb http://deb.grml.org/ grml-testing main - deb-src http://deb.grml.org/ grml-testing main + # deb-src http://deb.grml.org/ grml-testing main EOF # adjust apt-pinning (only prefer squashfs stuff from grml): diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index d78584f..0750201 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -54,16 +54,28 @@ fi # configure official Debian repositories: cat > "$DEBIAN_SOURCES_LIST" << EOF -# official debian repository: +# official debian repository (mirror selected via geo-ip): deb http://cdn.debian.net/debian/ $SUITE main contrib non-free - deb-src http://cdn.debian.net/debian/ $SUITE main contrib non-free +# deb-src http://cdn.debian.net/debian/ $SUITE main contrib non-free + +# official debian repository: +# deb http://ftp.debian.org/debian/ sid main contrib non-free +# deb-src http://ftp.debian.org/debian/ sid main contrib non-free + +# official debian DE repository: +# deb http://ftp.de.debian.org/debian/ sid main contrib non-free +# deb-src http://ftp.de.debian.org/debian/ sid main contrib non-free + +# official debian AT repository: +# deb http://ftp.at.debian.org/debian/ sid main contrib non-free +# deb-src http://ftp.at.debian.org/debian/ sid main contrib non-free EOF # configure grml-stable repository: cat > "$GRML_SOURCES_LIST" << EOF # stable grml repository: deb http://deb.grml.org/ grml-stable main - deb-src http://deb.grml.org/ grml-stable main +# deb-src http://deb.grml.org/ grml-stable main EOF ENABLE_GRML_TESTING=false @@ -78,7 +90,7 @@ if $ENABLE_GRML_TESTING ; then cat >> "$GRML_SOURCES_LIST" << EOF # testing/developer grml repository: deb http://deb.grml.org/ grml-testing main - deb-src http://deb.grml.org/ grml-testing main +# deb-src http://deb.grml.org/ grml-testing main EOF else # no devel/daily build: cat >> "$GRML_SOURCES_LIST" << EOF -- 2.1.4