X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=002e000b71feda23e08494fe12edc10e90b308b5;hp=9e4df635f8191c20c940a22c4a75530bab411c51;hb=4b2e8632eba4fa2343986f897cfcd59ed1413d66;hpb=961a5ebdae6d44584eba0d413f6541838865aead

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 9e4df63..002e000 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
 # Purpose:       configure Debian package management of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -8,13 +8,24 @@
 
 set -e
 
+if [ -L "$target"/etc/apt/sources.list ] ; then
+   echo "Note: $target/etc/apt/sources.list seems to be the old sources.list setup."
+   echo "|->   Not modifying anything. If you want to switch to the new setup just"
+   echo "\`->   remove symlink $target/etc/apt/sources.list"
+   exit 0
+fi
+
 # 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:
+# restore original grml sources.list file (temporarly moved via
+# /etc/grml/fai/config/hooks/instsoft.GRMLBASE):
 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
+if [ -r $target/etc/apt/sources.list.d/debian.unused ] ; then
+   mv $target/etc/apt/sources.list.d/debian.unused $target/etc/apt/sources.list.d/debian.list
+fi
 
 GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
 DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"
@@ -47,16 +58,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
@@ -71,7 +94,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