From 606e6575915e78ac89f35e0a90873aabbd5b9b0e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 19 Mar 2023 20:47:36 -0700
Subject: [PATCH] Switch to Memtest86+ under UEFI

Memtest86 (by Passmark) still available as an alternate option.
---
 setup/build_linux                        | 11 +++++++++--
 setup/linux/profile/EFI/boot/refind.conf | 14 +++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/setup/build_linux b/setup/build_linux
index 73c05197..37d0762d 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -134,7 +134,14 @@ function update_live_env() {
   rsync -aI "$TEMP_DIR/refind"/refind*/refind/icons/ "$PROFILE_DIR/EFI/boot/icons/"
   sed -i "s/%ARCHISO_LABEL%/${label}/" "$PROFILE_DIR/EFI/boot/refind.conf"
 
-  # Memtest86
+  # Memtest86+ (Open Source)
+  mkdir -p "$PROFILE_DIR/EFI/memtest86+"
+  mkdir -p "$TEMP_DIR/memtest86+"
+  curl -Lo "$TEMP_DIR/memtest86+/memtest86-binaries.zip" "https://memtest.org/download/v6.10/mt86plus_6.10.binaries.zip"
+  7z e "$TEMP_DIR/memtest86+/memtest86-binaries.zip" -o"$TEMP_DIR/memtest86+" "memtest64.efi"
+  mv "$TEMP_DIR/memtest86+/memtest64.efi" "$PROFILE_DIR/EFI/memtest86+/bootx64.efi"
+
+  # Memtest86 (Passmark)
   mkdir -p "$PROFILE_DIR/EFI/memtest86/Benchmark"
   mkdir -p "$TEMP_DIR/memtest86"
   curl -Lo "$TEMP_DIR/memtest86/memtest86-usb.zip" "https://www.memtest86.com/downloads/memtest86-usb.zip"
@@ -142,7 +149,7 @@ function update_live_env() {
   7z e -aoa "$TEMP_DIR/memtest86/memtest86-usb.img" -o"$TEMP_DIR/memtest86" "MemTest86.img"
   7z x -aoa "$TEMP_DIR/memtest86/MemTest86.img" -o"$TEMP_DIR/memtest86"
   rm "$TEMP_DIR/memtest86/EFI/BOOT/BOOTIA32.efi"
-  mv "$TEMP_DIR/memtest86/EFI/BOOT/BOOTX64.efi" "$PROFILE_DIR/EFI/memtest86/memtestx64.efi"
+  mv "$TEMP_DIR/memtest86/EFI/BOOT/BOOTX64.efi" "$PROFILE_DIR/EFI/memtest86/bootx64.efi"
   mv "$TEMP_DIR/memtest86/EFI/BOOT"/* "$PROFILE_DIR/EFI/memtest86"/
   mv "$TEMP_DIR/memtest86/help"/* "$PROFILE_DIR/EFI/memtest86"/
   mv "$TEMP_DIR/memtest86/license.rtf" "$PROFILE_DIR/EFI/memtest86"/
diff --git a/setup/linux/profile/EFI/boot/refind.conf b/setup/linux/profile/EFI/boot/refind.conf
index 858081f9..a06beec2 100644
--- a/setup/linux/profile/EFI/boot/refind.conf
+++ b/setup/linux/profile/EFI/boot/refind.conf
@@ -3,7 +3,7 @@
 timeout 0
 scanfor manual
 showtools firmware,reboot,shutdown
-default_selection MemTest86
+default_selection Memtest86+
 csr_values 10,77
 #use_graphics_for osx,linux,windows
 
@@ -15,9 +15,17 @@ selection_small selection_small.png
 hideui arrows,badges
 
 # Entries
-menuentry "MemTest86" {
+menuentry "MemTest86+" {
     icon /EFI/boot/icons/wk_memtest.png
-    loader /EFI/memtest86/bootx64.efi
+    options "nobigstatus nopause"
+    loader /EFI/memtest86+/bootx64.efi
+    submenuentry "Memtest86+ (Open Source)" {
+        loader /EFI/memtest86+/bootx64.efi
+    }
+    submenuentry "Memtest86 (Passmark)" {
+        loader /EFI/memtest86/bootx64.efi
+        options
+    }
 }
 
 menuentry "Linux" {