X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=07502018a266d9624ca77152d5a110bc340ac031;hp=0edf2f22897c50142953e7abceb4ffeeb87c7162;hb=08d8db7511b78113edfb8ef04a40706315fd73a7;hpb=02b32aa7fe4022fdefc80552539ecba4f1067492

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 0edf2f2..0750201 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -4,18 +4,100 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Sep 16 23:10:06 CEST 2007 [mika]
 ################################################################################
 
-set -u
 set -e
 
-rm -f $target/etc/apt/sources.list
+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"
+
+[ -d $target/etc/apt/sources.list.d ] || mkdir $target/etc/apt/sources.list.d
+
+# remove any existing sources.list and inform user about the new
+# /etc/apt/sources.list.d/ setup:
+cat > $target/etc/apt/sources.list << EOF
+##### IMPORTANT NOTE ##############################################
+# The configuration file /etc/apt/sources.list has been split
+# into structured files in /etc/apt/sources.list.d/ - check out:
+#
+#  /etc/apt/sources.list.d/grml.list   for the grml related repositories
+#  /etc/apt/sources.list.d/debian.list for official Debian repositories
+#
+# If you're looking for the "old" /etc/apt/sources.list file or
+# need some further repositories please take a look at the file
+# /etc/apt/sources.list.grml
+##### IMPORTANT NOTE ##############################################
+EOF
+
+# retrieve build information ($SUITE):
+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"
+[ -n "$SUITE" ] || SUITE="stable"
+
+# configure official Debian repositories:
+cat > "$DEBIAN_SOURCES_LIST" << EOF
+# 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
+
+# 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
 
-$ROOTCMD ln -s /etc/apt/sources.list.grml /etc/apt/sources.list
+# 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
+EOF
+
+ENABLE_GRML_TESTING=false
+# if we have a devel-version or a daily snapshot enable grml-testing by default:
+if [ -n "$GRML_NAME" -o -n "$RELEASENAME" ] ; then
+   if echo "$GRML_NAME" "$RELEASENAME" | grep -e devel -e autobuild 1>/dev/null ; then
+      ENABLE_GRML_TESTING=true
+   fi
+fi
 
-if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
-   cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences
+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
+EOF
+else # no devel/daily build:
+  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
+EOF
 fi
 
 ## END OF FILE #################################################################