Make sure to use sources.list of grml-live, even on updates through -u option. [Close...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 33-aptsetup

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index d78584f..64bd111 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -18,10 +18,14 @@ 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"
@@ -54,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
@@ -78,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