X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=d78584f0669736dfe05341acab483531f712d907;hb=27a3d5320ebfddf05770d111faa90d83f04f5a4c;hp=03c153b717d433db26f3b99026af0f4e617c3190;hpb=5eabf98c5e2bcb6a2a1ad5da385253acca03cdcd;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 03c153b..d78584f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -8,9 +8,21 @@
 
 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:
+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"
 
@@ -43,8 +55,8 @@ fi
 # configure official Debian repositories:
 cat > "$DEBIAN_SOURCES_LIST" << EOF
 # official debian repository:
-  deb     http://ftp.de.debian.org/debian/ $SUITE main contrib non-free
-  deb-src http://ftp.de.debian.org/debian/ $SUITE main contrib non-free
+  deb     http://cdn.debian.net/debian/ $SUITE main contrib non-free
+  deb-src http://cdn.debian.net/debian/ $SUITE main contrib non-free
 EOF
 
 # configure grml-stable repository: