summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-11-05 20:34:14 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-11-05 20:40:07 +0000
commitf24a070cb0e3bee26f56a6b5ff24a170056788d8 (patch)
treec0ca0fc7fb9bc1f6f2bf3cafb2e513d9650c4ee3 /images
parent4355c3feb1a55cb9bc300ef8b5ef628d41eccd02 (diff)
downloaddrakx-f24a070cb0e3bee26f56a6b5ff24a170056788d8.tar
drakx-f24a070cb0e3bee26f56a6b5ff24a170056788d8.tar.gz
drakx-f24a070cb0e3bee26f56a6b5ff24a170056788d8.tar.bz2
drakx-f24a070cb0e3bee26f56a6b5ff24a170056788d8.tar.xz
drakx-f24a070cb0e3bee26f56a6b5ff24a170056788d8.zip
Use pcmemtest instead of memtest86+ (mga#25232).
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 3 insertions, 1 deletions
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',