X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=0a3fb39beb2018d4a769fc9817c3cce7c503e6ac;hp=e5d724b55e68695214163ad79b9f4e3363b4fe13;hb=f532d104825cdf1e3d077efd09861f7ab6e5339d;hpb=2c86fb71a71507c55bb79f03d135916ad7d5bd72 diff --git a/grml-live b/grml-live index e5d724b..0a3fb39 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.28' +GRML_LIVE_VERSION='0.9.29' PN="$(basename $0)" CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -756,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