33-aptsetup: add backwards compability check for old sources.list layout

diff --git a/debian/changelog b/debian/changelog
index b8e181a..aec3bb5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-live (0.9.23) UNRELEASED; urgency=low
+
+  * Add backwards compability check for old sources.list layout
+    (we're using /etc/apt/sources.list.d now) to script
+    /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+
+ -- Michael Prokop <mika@grml.org>  Mon, 07 Sep 2009 20:24:12 +0200
+
 grml-live (0.9.22) unstable; urgency=low
 
   * Send 'Find FAI build logs at' message to grml-live.log as well.

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 9e4df63..d78584f 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -8,6 +8,13 @@
 
 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
 

diff --git a/grml-live b/grml-live
index b35bacd..7f728da 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.9.22'
+GRML_LIVE_VERSION='0.9.23-prerelease'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"