Accepting request 1140339 from home:gcomes.obs

- allow to boot memtest86 if stored in /usr/lib/memtest86+
  * SR#1071109 can then work

OBS-URL: https://build.opensuse.org/request/show/1140339
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=482

20_memtest86+

@@ -35,17 +35,31 @@ fi
 
 # memtest86+ comes in two flavours, one EFI and one suitable for x86 real mode.
 # The EFI module requires security disabled in BIOS (Boot Mode: Other OS)
-if [ -d /sys/firmware/efi -a -f /boot/efi/EFI/memtest86/memtest.efi ]; then
-  memtest=/boot/efi/EFI/memtest86/memtest.efi
+if [ -d /sys/firmware/efi ]; then
+  if [ -f /boot/efi/EFI/memtest86/memtest.efi ]; then
+    memtest=/boot/efi/EFI/memtest86/memtest.efi
+  elif [ -f /usr/lib/memtest86+/memtest.efi ]; then
+    memtest=/usr/lib/memtest86+/memtest.efi
+  else
+    #memtest.efi not found
+    exit 0
+  fi
   loader='linux  '
   message="$(gettext_printf "Loading EFI memtest ...\n" | grub_quote)"
-  # locate the real EFI partition
-  GRUB_DEVICE_BOOT=$(grub2-probe -t device "$memtest")
 else
-  memtest=/boot/memtest.bin
+  if [ -f /boot/memtest.bin ]; then
+    memtest=/boot/memtest.bin
+  elif [ -f /usr/lib/memtest86+/memtest.bin ]; then
+    memtest=/usr/lib/memtest86+/memtest.bin
+  else
+    #memtest.bin not found
+    exit 0
+  fi
   loader='linux16'
   message="$(gettext_printf "Loading x86 memtest ...\n" | grub_quote)"
 fi
+# locate the real partition
+GRUB_DEVICE_BOOT=$(grub2-probe -t device "$memtest")
 
 if grub_file_is_not_garbage "$memtest" ; then
   gettext_printf "Found memtest image: %s\n" "$memtest" >&2

grub2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 20 20:08:34 UTC 2024 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- allow to boot memtest86 if stored in /usr/lib/memtest86+
+  * SR#1071109 can then work
+
 -------------------------------------------------------------------
 Wed Jan 17 03:32:48 UTC 2024 - Michael Chang <mchang@suse.com>