Copy UEFI Shell to (ISO)/EFI/boot/bootx64.efi for setting up UEFI bootable USB and add refind-efi-x86_64 to ISO

4 files changed, 19 insertions, 2 deletions

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 7aad14e..63cbad0 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -94,7 +94,13 @@ make_boot_efi() {
 
             # Add an EFI shell script for automatic boot if ESC-key is not pressed within 5 seconds timeout.
             sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-                 s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup.nsh > ${work_dir}/efiboot/EFI/boot/startup.nsh
+                 s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_iso.nsh > ${work_dir}/efiboot/EFI/boot/startup.nsh
+
+            mkdir -p ${work_dir}/iso/EFI/boot
+            cp ${work_dir}/efiboot/EFI/boot/bootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi
+
+            sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+                 s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_usb.nsh > ${work_dir}/iso/EFI/boot/startup.nsh
 
             umount ${work_dir}/efiboot
         fi
diff --git a/configs/releng/efiboot/EFI/boot/startup.nsh b/configs/releng/efiboot/EFI/boot/startup_iso.nsh
index f50aed2..5c35ca8 100644
--- a/configs/releng/efiboot/EFI/boot/startup.nsh
+++ b/configs/releng/efiboot/EFI/boot/startup_iso.nsh
@@ -1,6 +1,6 @@
 @echo -off
 
-for %m run (0 9)
+for %m run (0 20)
     if exist fs%m:\EFI\archiso\vmlinuz.efi then
         fs%m:
         cd fs%m:\EFI\archiso
diff --git a/configs/releng/efiboot/EFI/boot/startup_usb.nsh b/configs/releng/efiboot/EFI/boot/startup_usb.nsh
new file mode 100644
index 0000000..439e400
--- /dev/null
+++ b/configs/releng/efiboot/EFI/boot/startup_usb.nsh
@@ -0,0 +1,10 @@
+@echo -off
+
+for %m run (0 20)
+    if exist fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz then
+        fs%m:
+        cd fs%m:\%INSTALL_DIR%\boot\x86_64
+        echo "Launching Archiso Kernel fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz"
+        vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\%INSTALL_DIR%\boot\x86_64\archiso.img
+    endif
+endfor
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index d8559fa..a5be3c4 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -38,6 +38,7 @@ openssh
 openvpn
 parted
 pptpclient
+refind-efi-x86_64
 rp-pppoe
 rsync
 smartmontools