Replaced /etc/grml/fai/files/etc/apt/preferences with /etc/grml/fai/apt/preferences...

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index d595a41..e279fdb 100755 (executable)
--- 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,7 +254,7 @@ 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' || \
+      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