diff options
| author | Guido Berhoerster <guido+freiesoftware@berhoerster.name> | 2023-08-23 10:58:16 +0200 |
|---|---|---|
| committer | Mike Gabriel <sunweaver@debian.org> | 2023-09-07 18:45:35 +0000 |
| commit | 9d091178c3f6810d3b68298037dddb5fe1396e77 (patch) | |
| tree | 619f1fd379b202190f18dfe7b6fe83dcbbd2aea7 /bin | |
| parent | 9f8a332a4e1f909d1ae62f40afbc6c50e4f084de (diff) | |
| download | debian-edu-fai+itzks-9d091178c3f6810d3b68298037dddb5fe1396e77.tar.gz debian-edu-fai+itzks-9d091178c3f6810d3b68298037dddb5fe1396e77.tar.bz2 debian-edu-fai+itzks-9d091178c3f6810d3b68298037dddb5fe1396e77.zip | |
Add support for memtest86+ 6
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/debian-edu-faiinstall | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/debian-edu-faiinstall b/bin/debian-edu-faiinstall index 16eb298..bfe351a 100755 --- a/bin/debian-edu-faiinstall +++ b/bin/debian-edu-faiinstall @@ -317,7 +317,12 @@ fi # generate ipxe menu on a plain main server for PXE installations cp /usr/lib/ipxe/undionly.kpxe "${tftpdir}/debian-edu-fai/" cp /usr/lib/ipxe/snponly.efi "${tftpdir}/debian-edu-fai/" -cp /boot/memtest86+.bin "${tftpdir}/debian-edu-fai/" +for memtest_bios in memtest86+x64.bin memtest86+.bin; do + [ -f "/boot/${memtest_bios}" ] && break +done +cp "/boot/${memtest_bios}" "${tftpdir}/debian-edu-fai/" +memtest_efi="${memtest_bios%.bin}.efi" +[ -f "/boot/${memtest_efi}" ] && cp "/boot/${memtest_efi}" "${tftpdir}/debian-edu-fai/" echo "Generating ${tftpdir}/debian-edu-fai/ltsp.ipxe" cat <<EOF > "${tftpdir}/debian-edu-fai/ltsp.ipxe" #!ipxe @@ -352,7 +357,7 @@ choose --timeout \${menu-timeout} --default \${img} img || goto cancel goto \${img} :memtest -iseq \${platform} pcbios && kernel memtest86+.bin || kernel memtest.efi +iseq \${platform} pcbios && kernel ${memtest_bios} || kernel ${memtest_efi} # Boot "fails" on normal memtest exit with Esc, so show the menu again boot || goto start |