X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=25246d67c1808fd22292997c9c0f182b779259df;hb=5b5c936ad418d1fd227199568c1449a366dc03b0;hp=90346a462825811b2f49dfab229769ce8c0379e2;hpb=82f9695335f16259ceb18fa54a3cb81cd1a42ce3;p=grml-live.git diff --git a/grml-live b/grml-live index 90346a4..25246d6 100755 --- a/grml-live +++ b/grml-live @@ -14,7 +14,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.9.11' +GRML_LIVE_VERSION='0.9.13' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -552,13 +552,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/ if [ -z "$NO_ADDONS" ] ; then - # copy only files so we can handle bsd4grml on its own - for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do - test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/ - done - - if [ -z "$NO_ADDONS_BSD4GRML" ] ; then - cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/ + if ! [ -d /usr/share/grml-live/templates/boot/addons/bsd4grml ] ; then + ewarn "Boot addons not found, skipping therefor. (Consider installing package grml-live-addons)" ; eend 0 + else + # copy only files so we can handle bsd4grml on its own + for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do + test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/ + done + + if [ -z "$NO_ADDONS_BSD4GRML" ] ; then + cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/ + fi fi fi