X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=efb6cbd973522f80c303807b61eaf29af9101e4e;hb=398c7063b3d9796ee7bd1bbb85412e2370476574;hp=7b7d264f92ebe59d80096269e4fede4006f91029;hpb=9d10b3dfa3eea348d90ca085ebba5cfc562e0462;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 7b7d264..efb6cbd 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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] ################################################################################ set -u @@ -16,10 +15,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