rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

https://bugzilla.opensuse.org/show_bug.cgi?id=1219074

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=315
This commit is contained in:
Dominique Leuenberger 2024-01-23 08:12:54 +00:00 committed by Git OBS Bridge
parent 3fa3269c62
commit 1a268dba3e
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
20_memtest86+
View File

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

6
grub2.changes
View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
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> Wed Jan 17 03:32:48 UTC 2024 - Michael Chang <mchang@suse.com>