Keep all SYSLINUX files in /syslinux

This gets rid of the duplicate ldlinux.c32 and the useless isolinux.cfg which only points to syslinux.cfg.

Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/46 .

2 files changed, 4 insertions, 4 deletions

diff --git a/configs/baseline/syslinux/syslinux-linux.cfg b/configs/baseline/syslinux/syslinux-linux.cfg
index 21dfbd7..867d815 100644
--- a/configs/baseline/syslinux/syslinux-linux.cfg
+++ b/configs/baseline/syslinux/syslinux-linux.cfg
@@ -3,6 +3,6 @@
 
 LABEL arch
 MENU LABEL Arch Linux (x86_64, BIOS)
-LINUX boot/%ARCH%/vmlinuz-linux
-INITRD boot/%ARCH%/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index c021a0e..88a36ea 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -1,11 +1,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-UI boot/syslinux/menu.c32
+UI menu.c32
 MENU TITLE Arch Linux
 MENU CLEAR
 
 DEFAULT arch
 TIMEOUT 30
 
-INCLUDE boot/syslinux/syslinux-linux.cfg
+INCLUDE syslinux-linux.cfg