summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
Diffstat (limited to 'images')
-rw-r--r--images/NEWS1
-rw-r--r--images/grub2.config4
-rwxr-xr-ximages/make_boot_img2
3 files changed, 6 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index f22684014..84bae0119 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
- use pcmemtest instead of memtest86+ (mga#25232)
+- add memory test to UEFI boot menu
Version 2.74 - 14 September 2020 by Thierry Vignaud
diff --git a/images/grub2.config b/images/grub2.config
index 73c6a4713..9cde03e59 100644
--- a/images/grub2.config
+++ b/images/grub2.config
@@ -31,3 +31,7 @@ menuentry 'Start Mageia 8 (Cauldron) Rescue' {
linux /isolinux/x86_64/vmlinuz audit=0 noiswmd rescue
initrd /isolinux/x86_64/all.rdz
}
+
+menuentry 'Memory Test' {
+ linux32 /isolinux/memtest
+}
diff --git a/images/make_boot_img b/images/make_boot_img
index bd32cf77d..044fa52d4 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -343,7 +343,7 @@ sub boot_iso {
if ($arch =~ /x86_64/) {
_ "mkdir -p .boot_iso/EFI/BOOT/";
# create efi loader
- my $efi_core = "configfile normal boot linux loadenv ls reboot search search_label";
+ my $efi_core = "configfile normal boot linux linux32 loadenv ls reboot search search_label";
my $efi_part_fs = "part_msdos part_gpt part_apple fat iso9660 udf";
my $efi_gfx = "gfxmenu gfxterm efi_gop efi_uga video video_bochs video_cirrus video_fb font png";
_ "/usr/bin/grub2-mkimage --prefix='/EFI/BOOT' -O x86_64-efi -o .boot_iso/EFI/BOOT/bootx64.efi $efi_core $efi_part_fs $efi_gfx";