diff options
| author | Raphaël Hertzog <raphael@offensive-security.com> | 2019-12-19 18:18:44 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <raphael@offensive-security.com> | 2019-12-19 18:18:44 +0100 |
| commit | 44b9b0a6501476de594ce3783cea5df0c141478c (patch) | |
| tree | dd84f8ea71c77fc5774a736db95f7669e1e58c2b /scripts/build/binary_iso | |
| parent | e7221c02f3baae0eaeb804b573551ad883d95290 (diff) | |
| download | vyos-live-build-44b9b0a6501476de594ce3783cea5df0c141478c.tar.gz vyos-live-build-44b9b0a6501476de594ce3783cea5df0c141478c.zip | |
Support --distribution-binary and --distribution-chroot
This makes it possible to build an image against a first distribution
(--distribution-chroot) and have the resulting image point to another
distribution (--distribution-binary). We can use this to build against a
snapshot and have the result use the original distribution that was
snapshotted.
Closes: #888507
Diffstat (limited to 'scripts/build/binary_iso')
| -rwxr-xr-x | scripts/build/binary_iso | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 1ca460c02..7955bcdd3 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -157,8 +157,8 @@ do grub-efi) if [ -e binary/boot/grub/efi.img ] then - XORRISO_OPTIONS="${XORRISO_OPTIONS} -e boot/grub/efi.img -no-emul-boot" - XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus" + XORRISO_OPTIONS="${XORRISO_OPTIONS} --efi-boot boot/grub/efi.img" + XORRISO_OPTIONS="${XORRISO_OPTIONS} -append_partition 2 0x01 binary/boot/grub/efi.img" else Echo "No EFI boot code to include in the ISO" fi |