X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=cadc4708fb8e81a8f8fa2502cf3961e7de6d58b7;hb=526ba1cce23f98c73f1e58584ba08bcfbbd942c2;hp=5f04f872a9214bfa2ab23a07bb531cb652c09d12;hpb=f39de8a70fa655b8c7a1cd5e012c624fa635e31c;p=grml-live.git diff --git a/grml-live b/grml-live index 5f04f87..cadc470 100755 --- a/grml-live +++ b/grml-live @@ -23,11 +23,12 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.26' +GRML_LIVE_VERSION='0.9.27' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' +ADDONS_LIST_FILE='/boot/isolinux/addons_list.cfg' # }}} # usage information {{{ @@ -696,6 +697,13 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "$BUILD_OUTPUT"/boot/isolinux/f4 sed -i "s/%SQUASHFS_NAME%/$SQUASHFS_NAME/" "$BUILD_OUTPUT"/boot/isolinux/f5 + # generate addon list + rm "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}" + for name in $(ls "${BUILD_OUTPUT}"/boot/isolinux/addon_*.cfg) ; do + include_name=$(basename "$name") + echo "include $include_name" >> "${BUILD_OUTPUT}/${ADDONS_LIST_FILE}" + done + if ! [ -r "${BUILD_OUTPUT}/boot/isolinux/${DISTRI_NAME}.cfg" ] || [ "$DISTRI_NAME" = "grml" ] ; then log "including grmlmain.cfg in ${BUILD_OUTPUT}/boot/isolinux/distri.cfg" echo "include grmlmain.cfg" > "${BUILD_OUTPUT}/boot/isolinux/distri.cfg"