Activate grml-testing repository for devel releases and daily snapshots.

diff --git a/debian/changelog b/debian/changelog
index 5408557..cf54892 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ grml-live (0.9.4) unstable; urgency=low
     kernel 2.6.26-grml[64].
   * GRML_MEDIUM: replace rt73-module-2.6.26-grml with
     rt73-modules-2.6.26-grml.
+  * Activate grml-testing repository for devel releases and
+    daily snapshots.
 
- -- Michael Prokop <mika@grml.org>  Sat, 27 Sep 2008 18:51:26 +0200
+ -- Michael Prokop <mika@grml.org>  Sat, 27 Sep 2008 22:33:05 +0200
 
 grml-live (0.9.3) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 2ccff06..7b7d264 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -4,7 +4,7 @@
 # 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: Mit Okt 24 14:30:39 CEST 2007 [mika]
+# Latest change: Sat Sep 27 22:31:49 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -14,6 +14,15 @@ rm -f $target/etc/apt/sources.list
 
 $ROOTCMD ln -s /etc/apt/sources.list.grml /etc/apt/sources.list
 
+# if we have a devel-version or a daily snapshot
+# let's activate grml-testing by default:
+if [ -r "$target"/etc/grml_version ] ; then
+   # if awk '{print $1}' /etc/grml_version | grep -q devel ; then
+   if grep -e devel -e autobuild /etc/grml_version 1>/dev/null ; then
+      sed -i 's|^#\(.*deb.*deb.grml.org.*grml-testing\)|\1|' /etc/apt/sources.list
+   fi
+fi
+
 #if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
 #   cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences
 #fi