From 0c0b318a4797729941fb7f60b7c0f3983d9e34cf Mon Sep 17 00:00:00 2001
From: Maciej Prill <mprill@wmi.amu.edu.pl>
Date: Mon, 12 Feb 2024 15:29:21 +0100
Subject: [PATCH] 24.02 - moved memtest URL to main script, added GRUB modules
 for Debian 12 compatbility.

---
 bookworm-amd64/bin/dist_iso | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/bookworm-amd64/bin/dist_iso b/bookworm-amd64/bin/dist_iso
index 6467dcd..9124522 100755
--- a/bookworm-amd64/bin/dist_iso
+++ b/bookworm-amd64/bin/dist_iso
@@ -3,7 +3,8 @@
 VERSION=$1
 ARCH=$2
 OUTPUT=$3
-NOFIRMWARE=$4
+MEMTEST_URL=$4
+NOFIRMWARE=$5
 
 TEMP_DIR=$(mktemp -d)
 SCRIPTDIR="$(dirname "$(realpath "$0")")"
@@ -35,8 +36,8 @@ echo
 
 TEMP_DIR_MEMTEST=$(mktemp -d)
 
-wget -q https://memtest.org/download/v6.20/mt86plus_6.20.binaries.zip -P ${TEMP_DIR_MEMTEST}
-unzip -q ${TEMP_DIR_MEMTEST}/mt86plus_6.20.binaries.zip -d ${TEMP_DIR_MEMTEST}
+wget -q ${MEMTEST_URL} -O ${TEMP_DIR_MEMTEST}/memtest.zip
+unzip -q ${TEMP_DIR_MEMTEST}/memtest.zip -d ${TEMP_DIR_MEMTEST}
 cp ${TEMP_DIR_MEMTEST}/memtest64.bin "$TEMP_DIR/memtest/memtest.bin"
 cp ${TEMP_DIR_MEMTEST}/memtest64.efi "$TEMP_DIR/memtest/memtest.efi"
 rm -r "${TEMP_DIR_MEMTEST}"
@@ -57,11 +58,20 @@ grub-mkimage -O i386-pc -p /boot/bios/ -o ${TEMP_DIR_GRUB}/core.img iso9660 bios
 
 #cp -r /usr/lib/grub/i386-pc/*  $TEMP_DIR/boot/bios/i386-pc
 #rm $TEMP_DIR/boot/bios/i386-pc/*.img
-for module in normal boot extcmd crypto terminal gettext bufio \
-            linux video relocator mmap vbe video_fb \
-            linux16 datetime net priority_queue \
-            gfxterm font gfxmenu trig bitmap_scale bitmap video_colors \
-            png verifiers; do
+for module in bitmap bitmap_scale boot bufio \
+            datetime \
+            crypto \
+            extcmd \
+            font \
+            gettext gfxmenu gfxterm \
+            linux linux16 \
+            mmap \
+            net normal \
+            png priority_queue \
+            relocator \
+            terminal \
+            trig \
+            vbe verifiers video video_colors video_fb; do
     cp /usr/lib/grub/i386-pc/${module}.mod $TEMP_DIR/boot/bios/i386-pc
 done;