Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-12-06 12:22:18 +0200
committernl6720 <nl6720@gmail.com>2022-12-06 12:22:18 +0200
commit76815b1219e1d3d464c3b9c9a5a936374aa941c1 (patch)
treef8a7721c4c9bfbebcef12da96c5aa9a836a303fa /archiso
parent477294955a52874e167c33994dd99f9f3d60d912 (diff)
parent9d391c092570909a9631c514600d2588b2cd5310 (diff)
Merge remote-tracking branch 'origin/merge-requests/298'
By Jonathan Liu * origin/merge-requests/298: Add Memtest86+ to x86_64 UEFI GRUB boot menu See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/298
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso11
1 files changed, 11 insertions, 0 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index caeb21e..9b917ab 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -712,6 +712,14 @@ _make_bootmode_uefi-x64.grub.esp() {
mcopy -i "${efibootimg}" "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
fi
+ # Add other aditional/extra files to ${install_dir}/boot/
+ if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.efi" ]]; then
+ install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.efi" "${isofs_dir}/${install_dir}/boot/memtest.efi"
+ install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+ install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/common/GPL2/license.txt" \
+ "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+ fi
+
_msg_info "Done! GRUB set up for UEFI booting successfully."
}
@@ -997,6 +1005,9 @@ _validate_requirements_bootmode_uefi-x64.grub.esp() {
if [[ ! " ${pkg_list[*]} " =~ ' edk2-shell ' ]]; then
_msg_info "'edk2-shell' is not in the package list. The ISO will not contain a bootable UEFI shell."
fi
+ if [[ ! " ${pkg_list[*]} " =~ ' memtest86+-efi ' ]]; then
+ _msg_info "Validating '${bootmode}': 'memtest86+-efi' is not in the package list. Memory testing will not be available from GRUB."
+ fi
}
_validate_requirements_bootmode_uefi-x64.grub.eltorito() {