X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=d78584f0669736dfe05341acab483531f712d907;hb=0f85d1ba6a21ba9426fcf3c867227e48573e4cdf;hp=9cfbd2975ce98cadb0ec4d9c586d426958e6d172;hpb=339590e244585c5334c41250b10abdc01e732a17;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 9cfbd29..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"
 
@@ -33,8 +45,8 @@ cat > $target/etc/apt/sources.list << EOF
 EOF
 
 # retrieve build information ($SUITE):
-if [ -r $target/etc/grml/grml-live-build-info ] ; then
-  . $target/etc/grml/grml-live-build-info
+if [ -r $target/etc/grml_live_version ] ; then
+  . $target/etc/grml_live_version
 fi
 
 # if we stil do not know which Debian suite we are building assume "stable"
@@ -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: