X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=407cc17f0c39aabd6c46bd3bafd9f8150aeb7b12;hb=0f72adacbce0a22376ccc889598f29d8dd2966d9;hp=9fc2d26377ee87be9fb07858bdbf2f24017841dd;hpb=64160df70c57e1404ca3cfd27cfaf0a3928baf78;p=grml-live.git diff --git a/grml-live b/grml-live index 9fc2d26..407cc17 100755 --- a/grml-live +++ b/grml-live @@ -56,6 +56,7 @@ trap bailout 1 2 3 15 [ -n "$HOSTNAME" ] || HOSTNAME=grml [ -n "$USERNAME" ] || USERNAME=grml [ -n "$CLASSES" ] || CLASSES="GRML,I386" +[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux' [ -n "$TARGET" ] || bailout 1 "${PN}: \$TARGET not specified. Please adjust $LIVE_CONF. Exiting." [ -n "$VERSION" ] || VERSION="0.0.1" @@ -184,6 +185,7 @@ if [ -z "$FORCE" ] ; then [ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET" [ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET" [ -n "$SUITE" ] && echo " Debian suite: $SUITE" + [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" [ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." echo @@ -360,7 +362,6 @@ fi [ -n "$ISO_TARGET" ] || ISO_TARGET="$TARGET/grml_isos" [ -n "$ISO_NAME" ] || ISO_NAME="grml_${VERSION}.iso" -[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux' if [ "$BOOT_METHOD" = "isolinux" ] ; then BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat" elif [ "$BOOT_METHOD" = "grub" ] ; then