diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | a5139a6e4ed897d59c900d8ea991c60a19d01862 (patch) | |
| tree | f82a2c95fe0f34ddf5e7e4d88bfa33548e8269a8 /parabolaiso/mkparabolaiso | |
| parent | 2ad1f4471698f00cc3985437f461e2e17aeccfa3 (diff) | |
| parent | 491b627eb4b6af909ba8e19751378672930328eb (diff) | |
Merge branch 'master' of archiso into helper/rebrand
Conflicts:
Makefile
configs/releng/build.sh
configs/releng/mkinitcpio.conf
configs/releng/root-image/root/customize_root_image.sh
configs/releng/syslinux/parabolaiso_pxe32.cfg
configs/releng/syslinux/parabolaiso_pxe64.cfg
configs/releng/syslinux/parabolaiso_sys32.cfg
configs/releng/syslinux/parabolaiso_sys64.cfg
docs/README.build
parabolaiso/mkparabolaiso
Diffstat (limited to 'parabolaiso/mkparabolaiso')
| -rwxr-xr-x | parabolaiso/mkparabolaiso | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index e323899..02e5b95 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -414,7 +414,10 @@ command_iso () { # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image. if [[ -f "${work_dir}/iso/EFI/parabolaiso/efiboot.img" ]]; then - _iso_efi_boot_args="--efi-boot EFI/parabolaiso/efiboot.img" + _iso_efi_boot_args="-eltorito-alt-boot + -e EFI/parabolaiso/efiboot.img + -no-emul-boot + -isohybrid-gpt-basdat" fi _show_config iso @@ -436,8 +439,8 @@ command_iso () { -eltorito-boot isolinux/isolinux.bin \ -eltorito-catalog isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - ${_iso_efi_boot_args} \ -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \ + ${_iso_efi_boot_args} \ -output "${out_dir}/${img_name}" \ "${work_dir}/iso/" _msg_info "Done! | $(ls -sh ${out_dir}/${img_name})" |