Do not complain about missing addons_list.cfg file.

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 3f5a1c0..9e35a3d 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -24,7 +24,7 @@ fi
 # set -e
 
 # global variables
-GRML_LIVE_VERSION='0.14.1'
+GRML_LIVE_VERSION='0.15.0'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ADDONS_LIST_FILE='/boot/isolinux/addons_list.cfg'
@@ -458,8 +458,8 @@ deb http://cdn.debian.net/debian $SUITE  main contrib non-free
 EOF
 fi
 
-# notice: activate grml-live pool only if we are building against unstable:
-if grep -qwe unstable -qwe sid "$SOURCES_LIST_OUTPUT" ; then
+# notice: activate grml-live pool when building against unstable or testing:
+if grep -qwe unstable -qwe sid -qwe testing -qwe wheezy "$SOURCES_LIST_OUTPUT" ; then
    grep -q 'grml-live.*main' "$SOURCES_LIST_OUTPUT" || \
    grep grml-stable "$SOURCES_LIST_OUTPUT" | \
         sed 's/grml-stable/grml-live/' >> "$SOURCES_LIST_OUTPUT"
@@ -816,7 +816,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
        done
 
        # generate addon list
-       rm "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
+       rm -f "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"
        for name in "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg ; do
          include_name=$(basename "$name")
          echo "include $include_name"  >> "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}"