X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=0a3fb39beb2018d4a769fc9817c3cce7c503e6ac;hb=f532d104825cdf1e3d077efd09861f7ab6e5339d;hp=5f04f872a9214bfa2ab23a07bb531cb652c09d12;hpb=f39de8a70fa655b8c7a1cd5e012c624fa635e31c;p=grml-live.git diff --git a/grml-live b/grml-live index 5f04f87..0a3fb39 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.29' 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" @@ -748,12 +756,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then fi fi - # jump back to grub from bsd4grml: - if [ -e "$BUILD_OUTPUT"/boot/grub/stage2 ]; then - GRUB_LEGACY=stage2 - else - GRUB_LEGACY=stage2_eltorito - fi + # jump back to grub from bsd4grml (/boot/grub/stage2): + GRUB_LEGACY=stage2 + if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then GRUB_VERSION=2 @@ -763,8 +768,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \ "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \ - "$BUILD_OUTPUT"/boot/isolinux/addons.cfg \ - "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg \ + "$BUILD_OUTPUT"/boot/isolinux/*.cfg \ "$BUILD_OUTPUT"/boot/grub/grub.cfg \ "$BUILD_OUTPUT"/boot/grub/menu.lst ; do if [ -e "$file" ] ; then @@ -981,7 +985,7 @@ find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > if [ "$BOOT_METHOD" = "isolinux" ] ; then BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat" elif [ "$BOOT_METHOD" = "grub" ] ; then - BOOT_FILE="boot/grub/stage2_eltorito" + BOOT_FILE="boot/grub/stage2" fi if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" -a "$FORCE_ISO_REBUILD" = "false" ] ; then