Improve adjustment of suite for $FAI_DEBOOTSTRAP

diff --git a/debian/changelog b/debian/changelog
index 873f8ed..539c197 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ grml-live (0.0.4) unstable; urgency=low
   * Use iceweasel/firefox as x-www-browser and w3m as www-browser (if
     available). 
   * Check for presence of the initrd.
+  * Improve adjustment of suite for $FAI_DEBOOTSTRAP.
 
  -- Michael Prokop <mika@grml.org>  Thu, 04 Oct 2007 22:16:34 +0200
 

diff --git a/grml-live b/grml-live
index 0ad0e75..36359b0 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -242,9 +242,8 @@ if [ -n "$SUITE" ] ; then
    sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $LIVE_CONF
    sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
 
-   DIST='\"etch\|=\"stable=\"lenny=\"testing=\"sid=\"unstable'
-   sed -i "s#FAI_DEBOOTSTRAP=$DIST#FAI_DEBOOTSTRAP=\"$SUITE#" $LIVE_CONF
-   sed -i "s#FAI_DEBOOTSTRAP=$DIST#FAI_DEBOOTSTRAP=\"$SUITE#" /etc/grml/fai/make-fai-nfsroot.conf
+   sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF
+   sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" /etc/grml/fai/make-fai-nfsroot.conf
 fi
 # }}}