X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;fp=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=5e5cad7345e7d5108fb7abf3a7c879192d1bff02;hp=7b7d264f92ebe59d80096269e4fede4006f91029;hb=cbc3a3eeb59a1e1cb6ab0815e297bc95fb85cee3;hpb=c30850b9dbeeb73bbdfc9e49995c037c7387cb9b

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 7b7d264..5e5cad7 100755
--- 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: Sat Sep 27 22:31:49 CEST 2008 [mika]
+# Latest change: Sun Sep 28 20:08:30 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -16,10 +16,9 @@ $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
+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