diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 02:14:09 +0000 |
---|---|---|
committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-23 11:46:36 +0100 |
commit | 286caf03bed722e3438f37a54e7c2d9720fc6535 (patch) | |
tree | 17bf91125abb1e952dce8813bef105235226a907 | |
parent | da57ad77b9f47be3d9c12c688e8d6f483588b52c (diff) | |
download | vyos-live-build-286caf03bed722e3438f37a54e7c2d9720fc6535.tar.gz vyos-live-build-286caf03bed722e3438f37a54e7c2d9720fc6535.zip |
fix outdated grub-legacy bootloader name references
-rwxr-xr-x | functions/defaults.sh | 2 | ||||
-rwxr-xr-x | scripts/build/binary_hdd | 2 | ||||
-rwxr-xr-x | scripts/build/binary_iso | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 72e5e94cd..f1bb85dce 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -616,7 +616,7 @@ Check_config_defaults () case "${LIVE_IMAGE_TYPE}" in hdd*) 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." exit 1 ;; diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index c380374e7..b81c301da 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -55,7 +55,7 @@ Check_package host /sbin/losetup mount for BOOTLOADER in $(echo "${LB_BOOTLOADERS}" | tr "," "\n"); do case "${BOOTLOADER}" in - grub) + grub-legacy) Check_package chroot /usr/sbin/grub grub ;; esac diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 3b862b05a..eef752f80 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -120,7 +120,7 @@ do XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot " fi case "${BOOTLOADER}" in - grub) + grub-legacy) XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito" XORRISO_EXCLUDE="boot/grub/stage2_eltorito" |