X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=e279fdb6982afd579d1c8adcdf137bc74bb1f90c;hb=55b6f63b136105fdf7773216d8375e6d265bcb55;hp=171457ff581e135bb83c8222e259c239b2bf44fa;hpb=cebf5e26632f0b5669b212fae8c44874865bbb02;p=grml-live.git

diff --git a/grml-live b/grml-live
index 171457f..e279fdb 100755
--- a/grml-live
+++ b/grml-live
@@ -207,8 +207,8 @@ if [ -z "$FORCE" ] ; then
    [ -n "$BOOT_METHOD" ]   && echo "  Boot method:       $BOOT_METHOD"
    [ -n "$TEMPLATE_DIRECTORY" ] && echo "  Template files:    $TEMPLATE_DIRECTORY"
    [ -n "$FAI_ARGS" ]      && echo "  additional arguments for FAI: $FAI_ARGS"
-   [ -n "$VERBOSE" ]       && echo "  Using VERBOSE mode."
    [ -n "$LOGFILE" ]       && echo "  Logging to file:   $LOGFILE"
+   [ -n "$VERBOSE" ]       && echo "  Using VERBOSE mode."
    echo
    echo -n "Is this ok for you? [y/N] "
    read a
@@ -254,8 +254,12 @@ if [ -n "$SUITE" ] ; then
    sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
    # notice: activate grml-live pool only if we are building against unstable:
    if grep -qe unstable -qe sid /etc/grml/fai/apt/sources.list ; then
+      grep -q 'grml-live.*main' /etc/grml/fai/apt/sources.list || \
       grep grml-stable /etc/grml/fai/apt/sources.list | \
            sed 's/grml-stable/grml-live/' >> /etc/grml/fai/apt/sources.list
+   else
+      grep -q 'grml-live.*main' /etc/grml/fai/apt/sources.list && \
+      sed -i 's/.*grml-live.*/# removed grml-live repository/' /etc/grml/fai/apt/sources.list
    fi
 
    sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF