Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso8
1 files changed, 8 insertions, 0 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 3e9b112..1d7b781 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -380,6 +380,8 @@ command_checksum () {
# Create an ISO9660 filesystem from "iso" directory.
command_iso () {
+ local _iso_efi_boot_args=""
+
if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then
_msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1
fi
@@ -387,6 +389,11 @@ command_iso () {
_msg_error "The file '${work_dir}/iso/isolinux/isohdpfx.bin' does not exist." 1
fi
+ # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
+ if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then
+ _iso_efi_boot_args="--efi-boot EFI/archiso/efiboot.img"
+ fi
+
_show_config iso
if _is_directory_changed "${work_dir}/iso" "${out_dir}/${img_name}"; then
@@ -406,6 +413,7 @@ 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 \
-output "${out_dir}/${img_name}" \
"${work_dir}/iso/"