summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2022-09-17 20:10:17 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2022-09-17 20:10:17 +0100
commite85da9ba51f1eadbe8ae03281b24d0b4d37199dd (patch)
treed818f530488d8702d6e5c9f46518ee6022ef083f /images
parent190cbcbf9d6f885cfa713f1ed61acbbb111ac7a3 (diff)
downloaddrakx-e85da9ba51f1eadbe8ae03281b24d0b4d37199dd.tar
drakx-e85da9ba51f1eadbe8ae03281b24d0b4d37199dd.tar.gz
drakx-e85da9ba51f1eadbe8ae03281b24d0b4d37199dd.tar.bz2
drakx-e85da9ba51f1eadbe8ae03281b24d0b4d37199dd.tar.xz
drakx-e85da9ba51f1eadbe8ae03281b24d0b4d37199dd.zip
Revert to using Memtest86+, now it is based on PCMemTest.
Diffstat (limited to 'images')
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img2
2 files changed, 2 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 843112316..fc51baafd 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- revert to using Memtest86+, now it is based on PCMemTest
- Sync with kernel 5.17
- Sync with kernel 5.18
diff --git a/images/make_boot_img b/images/make_boot_img
index 92c6b7734..c7823b324 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -266,7 +266,7 @@ sub syslinux_all_files {
rename("images/all.rdz-$_", "$dir/$arch/all.rdz");
} @$kernels;
- _ "install -m 644 -D /boot/pcmemtest* $dir/memtest";
+ _ "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',