Activate grml-testing repository for devel/daily builds

diff --git a/debian/changelog b/debian/changelog
index 754533d..65b5910 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,10 @@ grml-live (0.9.4) unstable; urgency=low
   * 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.
+    daily snapshots. [Testing: issue531]
   * Add ipset to GRML_FULL.
 
- -- Michael Prokop <mika@grml.org>  Sun, 28 Sep 2008 15:28:14 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 29 Sep 2008 01:37:03 +0200
 
 grml-live (0.9.3) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index dadd5ae..bef142c 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -4,16 +4,19 @@
 # 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 22:57:36 CEST 2007 [mika]
+# Latest change: Sun Sep 28 20:08:14 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
-if grep -q 'small' $target/etc/grml_version ; then
-   cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
-else
-   cp $target/etc/runlevel.conf.livecd $target/etc/runlevel.conf
+# if we have a small ISO let's adjust runlevel.conf:
+if [ -n "$GRML_NAME" ] ; then
+   if echo "$GRML_NAME" | grep -q small ; then
+      cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
+   else
+      cp $target/etc/runlevel.conf.livecd $target/etc/runlevel.conf
+   fi
 fi
 
 ## END OF FILE #################################################################

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 7b7d264..5e5cad7 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: 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
 

diff --git a/grml-live b/grml-live
index 32afb5e..10240fe 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -246,6 +246,10 @@ specify it on the command line using the -o option."
 # trim characters that are known to cause problems inside $GRML_NAME;
 # for example isolinux does not like '-' inside the directory name
 [ -n "$GRML_NAME" ] && export SHORT_GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"
+
+# export variables to have them available in fai scripts:
+[ -n "$GRML_NAME" ]   && export "$GRML_NAME"
+[ -n "$RELEASENAME" ] && export "$RELEASENAME"
 # }}}
 
 # clean/zero grml-live logfile {{{