Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-10-27 11:04:42 +0300
committernl6720 <nl6720@gmail.com>2023-02-10 08:29:37 +0200
commit28d2bc11e3dc4a86667a8f5f379d8ac9c18c0a03 (patch)
treec7e7cdacd10f5db7af0b4238994db8e7fe68f7d5 /configs/releng
parent0f34e4429a6d16d201c2568417cdc5ff79dd68dd (diff)
mkarchiso: do not place memtest86+ in netboot artifacts
Move memtest86+ to `/boot/memtest86+/` on ISO 9660. That directory is not copied to netboot artifact output. Netboot boot menu https://ipxe.archlinux.org/releng/netboot/archlinux.ipxe does not have entries for memtest and archiso-manager removes these files (not the EFI one, though) before uploading the release files anyway.
Diffstat (limited to 'configs/releng')
-rw-r--r--configs/releng/grub/grub.cfg2
-rw-r--r--configs/releng/syslinux/archiso_tail.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
index ddf71e7..eb45a00 100644
--- a/configs/releng/grub/grub.cfg
+++ b/configs/releng/grub/grub.cfg
@@ -55,7 +55,7 @@ if [ "${grub_platform}" == "efi" ]; then
if [ "${grub_cpu}" == "x86_64" ]; then
menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
set gfxpayload=800x600,1024x768
- linux /%INSTALL_DIR%/boot/memtest.efi
+ linux /boot/memtest86+/memtest.efi
}
menuentry "UEFI Shell" {
insmod chain
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index dcbb413..e84897c 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -10,7 +10,7 @@ APPEND hd0 0
# https://www.memtest.org/
LABEL memtest
MENU LABEL Run Memtest86+ (RAM test)
-LINUX /%INSTALL_DIR%/boot/memtest
+LINUX /boot/memtest86+/memtest
# https://wiki.syslinux.org/wiki/index.php/Hdt_(Hardware_Detection_Tool)
LABEL hdt