diff options
| -rw-r--r-- | images/NEWS | 2 | ||||
| -rw-r--r-- | images/grub2.config | 4 | ||||
| -rwxr-xr-x | images/make_boot_img | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/images/NEWS b/images/NEWS index 9759d6bdc..f8a7abb3b 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- remove 'Memory Test' from boot images as we don't have linux32 module anymore in grub2 + Version 2.91 - 29 August 2023 by Thomas Backlund - switch to Mageia 10 (Cauldron) diff --git a/images/grub2.config b/images/grub2.config index 849476326..545722e00 100644 --- a/images/grub2.config +++ b/images/grub2.config @@ -31,7 +31,3 @@ menuentry 'Start Mageia 10 (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 c7823b324..31af50744 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -201,7 +201,6 @@ sub syslinux_cfg_all { { label => $arch, kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", append => join(' ', grep { $_ } $default_append, $default_acpi, $default_vga, $default_iswmd) }; } @kernels), - { label => 'memtest', kernel => 'memtest' }, ], $b_gfxboot); } sub remove_ending_zero { @@ -266,8 +265,6 @@ sub syslinux_all_files { rename("images/all.rdz-$_", "$dir/$arch/all.rdz"); } @$kernels; - _ "install -m 644 -D /boot/memtest* $dir/memtest"; - output("$dir/help.msg", syslinux_msg('help.msg.xml')); output("$dir/advanced.msg", syslinux_msg('advanced.msg.xml', "\nYou can choose the following kernels :\n", @@ -347,7 +344,7 @@ sub boot_iso { if ($arch =~ /x86_64/) { _ "mkdir -p .boot_iso/EFI/BOOT/"; # create efi loader - my $efi_core = "configfile normal boot linux linux32 loadenv ls reboot search search_label"; + my $efi_core = "configfile normal boot linux 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"; |