diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 08:17:28 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:08:07 +0200 |
| commit | 554a8d11088181e666a04558230e94b19f32f2d6 (patch) | |
| tree | 2130533ea8bdee71bd24aef01cfc351cadb4a23a /scripts/build/binary_grub-pc | |
| parent | 9b70092f259ae3ff309b31178b845ce2f92f2d76 (diff) | |
| download | vyos-live-build-554a8d11088181e666a04558230e94b19f32f2d6.tar.gz vyos-live-build-554a8d11088181e666a04558230e94b19f32f2d6.zip | |
tidy up grub bootloader compatibility checking
- add a validation check where an error will be printed
- replace the check done in the grub scripts with one that simple exits
if executed bypassing the validation check
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_grub-pc')
| -rwxr-xr-x | scripts/build/binary_grub-pc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc index 4549d3b41..85074a486 100755 --- a/scripts/build/binary_grub-pc +++ b/scripts/build/binary_grub-pc @@ -21,6 +21,10 @@ USAGE="${PROGRAM} [--force]" # Processing arguments and configuration files Init_config_data "${@}" +if In_list "${LIVE_IMAGE_TYPE}" hdd netboot; then + exit 0 +fi + Check_Any_Bootloader_Role "grub-pc" Echo_message "Begin installing grub-pc..." @@ -47,15 +51,6 @@ Restore_package_cache binary # Installing depends Install_package -# Setting destination directory -case "${LIVE_IMAGE_TYPE}" in - hdd|netboot) - Echo_warning "Bootloader in this image type not yet supported by live-build." - Echo_error "This would produce a not bootable image, aborting (FIXME)." - exit 1 - ;; -esac - # Copying templates mkdir -p binary/boot/grub/i386-pc |