X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=efb6cbd973522f80c303807b61eaf29af9101e4e;hb=2def18e419f1474c3904672ce297babbb4b9b501;hp=740b81e9cb2927e4c5abd550ab833e41a15da1d5;hpb=e08881cde5d29236a5992a0a501b43e88d66732d;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 740b81e..efb6cbd 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -1,10 +1,9 @@
 #!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRML/33-aptsetup
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
 # Purpose:       configure Debian package management of live-system
 # 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
@@ -14,9 +13,17 @@ rm -f $target/etc/apt/sources.list
 
 $ROOTCMD ln -s /etc/apt/sources.list.grml /etc/apt/sources.list
 
-if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
-   cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences
+# if we have a devel-version or a daily snapshot
+# let's activate 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
+      sed -i 's|^#\(.*deb.*deb.grml.org.*grml-testing\)|\1|' "$target"/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
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3