From f24a070cb0e3bee26f56a6b5ff24a170056788d8 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Thu, 5 Nov 2020 20:34:14 +0000
Subject: Use pcmemtest instead of memtest86+ (mga#25232).

---
 images/NEWS          | 2 ++
 images/make_boot_img | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'images')

diff --git a/images/NEWS b/images/NEWS
index e42e20326..f22684014 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- use pcmemtest instead of memtest86+ (mga#25232)
+
 Version 2.74 - 14 September 2020 by Thierry Vignaud
 
 - sync with kernel 5.9
diff --git a/images/make_boot_img b/images/make_boot_img
index d24300584..bd32cf77d 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -262,7 +262,7 @@ sub syslinux_all_files {
 	rename("images/all.rdz-$_", "$dir/$arch/all.rdz");
     } @$kernels;
 
-    _ "install -m 644 -D /boot/memtest* $dir/memtest";
+    _ "install -m 644 -D /boot/pcmemtest* $dir/memtest";
 
     output("$dir/help.msg", syslinux_msg('help.msg.xml'));
     output("$dir/advanced.msg", syslinux_msg('advanced.msg.xml', 
-- 
cgit v1.2.1