From ef39280ebeea52e69d3ec44e82f2f1aef5088273 Mon Sep 17 00:00:00 2001
From: Francois Dupoux <2386566-fdupoux@users.noreply.gitlab.com>
Date: Fri, 16 Dec 2022 09:20:30 +0000
Subject: [PATCH] Added Memtest86+ memory tester v6.00 for UEFI in the Grub
 boot menu (#308)

---
 ChangeLog                 | 5 +++++
 build.sh                  | 1 +
 efiboot/grub/grubsrcd.cfg | 6 ++++++
 packages                  | 1 +
 4 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ea7f80f..7e28591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ IMPORTANT: The 32bit (i686) release of SystemRescue will be deprecated soon
 unless volunteers are found to help maintaining it. See
 https://gitlab.com/systemrescue/systemrescue-sources/-/issues/278
 
+------------------------------------------------------------------------------
+9.06 (YYYY-MM-DD):
+------------------------------------------------------------------------------
+* Added Memtest86+ memory tester v6.00 for UEFI in the Grub boot menu (#308)
+
 ------------------------------------------------------------------------------
 9.05 (2022-10-21):
 ------------------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index 12a5f96..cf1929a 100755
--- a/build.sh
+++ b/build.sh
@@ -342,6 +342,7 @@ make_efi() {
          s|%INSTALL_DIR%|${install_dir}|g" \
          ${script_path}/efiboot/grub/grubsrcd.cfg > ${work_dir}/iso/boot/grub/grubsrcd.cfg
     cp -a /usr/share/edk2-shell/${edk2arch}/Shell_Full.efi ${work_dir}/iso/EFI/shell.efi
+    cp ${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.efi ${work_dir}/iso/EFI/memtest.efi
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
diff --git a/efiboot/grub/grubsrcd.cfg b/efiboot/grub/grubsrcd.cfg
index efea210..b44964c 100644
--- a/efiboot/grub/grubsrcd.cfg
+++ b/efiboot/grub/grubsrcd.cfg
@@ -74,6 +74,12 @@ menuentry "Stop during the boot process before mounting the root filesystem" {
 	initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
 }
 
+menuentry "Memtest86+ memory tester for UEFI" {
+    insmod fat
+	set gfxpayload=800x600,1024x768
+    linux /EFI/memtest.efi keyboard=both
+}
+
 menuentry "Start EFI Shell" {
     insmod fat
     insmod chain
diff --git a/packages b/packages
index 4ecca09..77c550a 100644
--- a/packages
+++ b/packages
@@ -128,6 +128,7 @@ man-pages
 mc
 mdadm
 memtest86+
+memtest86+-efi
 memtester
 mesa-minimal
 minicom