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

2 files changed, 6 insertions, 0 deletions

diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
index 43fad0e..79ea2d2 100644
--- a/configs/releng/grub/grub.cfg
+++ b/configs/releng/grub/grub.cfg
@@ -46,6 +46,11 @@ menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)"
 
 if [ "${grub_platform}" == "efi" ]; then
     if [ "${grub_cpu}" == "x86_64" ]; then
+        menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
+            set gfxpayload=800x600,1024x768
+            search --fs-uuid --no-floppy --set=root --label %ARCHISO_LABEL%
+            linux /%INSTALL_DIR%/boot/memtest.efi
+        }
         menuentry "UEFI Shell" {
             insmod chain
             search --no-floppy --set=root --label %ARCHISO_LABEL%
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index 02ef538..5771920 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -60,6 +60,7 @@ man-pages
 mc
 mdadm
 memtest86+
+memtest86+-efi
 mkinitcpio
 mkinitcpio-archiso
 mkinitcpio-nfs-utils