manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix outdated grub-legacy bootloader name references

This commit is contained in:
Lyndon Brown 2020-03-28 02:14:09 +00:00
parent da57ad77b9
commit 286caf03be
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/defaults.sh
View File

@ -616,7 +616,7 @@ Check_config_defaults ()
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in
hdd*) hdd*)
case "${LB_FIRST_BOOTLOADER}" in case "${LB_FIRST_BOOTLOADER}" in
grub) grub-legacy)
Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type." Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type."
exit 1 exit 1
;; ;;

2
scripts/build/binary_hdd
View File

@ -55,7 +55,7 @@ Check_package host /sbin/losetup mount
for BOOTLOADER in $(echo "${LB_BOOTLOADERS}" | tr "," "\n"); do for BOOTLOADER in $(echo "${LB_BOOTLOADERS}" | tr "," "\n"); do
case "${BOOTLOADER}" in case "${BOOTLOADER}" in
grub) grub-legacy)
Check_package chroot /usr/sbin/grub grub Check_package chroot /usr/sbin/grub grub
;; ;;
esac esac

2
scripts/build/binary_iso
View File

@ -120,7 +120,7 @@ do
XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot " XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot "
fi fi
case "${BOOTLOADER}" in case "${BOOTLOADER}" in
grub) grub-legacy)
XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito"
XORRISO_EXCLUDE="boot/grub/stage2_eltorito" XORRISO_EXCLUDE="boot/grub/stage2_eltorito"