diff options
| author | Luca Boccassi <bluca@debian.org> | 2021-02-14 21:37:35 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2021-02-14 21:38:19 +0000 |
| commit | b968e2c0f7625f679bbbe6db12feb30f4b7f3598 (patch) | |
| tree | 903218089926b10291b76c342ad8c2f1c46abb7e | |
| parent | b13c4b158359b279f9ab37c2ec27d4116cbd1126 (diff) | |
| download | vyos-live-build-b968e2c0f7625f679bbbe6db12feb30f4b7f3598.tar.gz vyos-live-build-b968e2c0f7625f679bbbe6db12feb30f4b7f3598.zip | |
Fix build on architecture without syslinux
Don't run xorriso with -isohybrid-mbr if LB_BOOTLOADER_BIOS is
not set to syslinux
Closes: #982746
| -rwxr-xr-x | scripts/build/binary_iso | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 5008d382a..753a7de49 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -66,7 +66,7 @@ fi XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes -iso-level 3" # Handle xorriso live-build specific options -if [ "${LB_IMAGE_TYPE}" = "iso-hybrid" ] +if [ "${LB_IMAGE_TYPE}" = "iso-hybrid" ] && [ "${LB_BOOTLOADER_BIOS}" = "syslinux" ] then XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -partition_offset 16" fi |