diff options
| author | nl6720 <nl6720@gmail.com> | 2020-11-17 14:10:21 +0200 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2020-11-30 16:00:15 +0200 |
| commit | 863247d0a6980906dad0308044f2f3b6ceccc110 (patch) | |
| tree | 7fee2d93d14b66def36282bcb0f9676db6959004 /configs/baseline | |
| parent | 183ae5279252cebca0aac5de328566e3e31b09c2 (diff) | |
| download | archiso-863247d0a6980906dad0308044f2f3b6ceccc110.tar.gz archiso-863247d0a6980906dad0308044f2f3b6ceccc110.tar.bz2 | |
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 .
Diffstat (limited to 'configs/baseline')
| -rw-r--r-- | configs/baseline/isolinux/isolinux.cfg | 9 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux-linux.cfg | 4 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux.cfg | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/configs/baseline/isolinux/isolinux.cfg b/configs/baseline/isolinux/isolinux.cfg deleted file mode 100644 index e078ce3..0000000 --- a/configs/baseline/isolinux/isolinux.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -PATH /%INSTALL_DIR%/boot/syslinux/ -DEFAULT loadconfig - -LABEL loadconfig - CONFIG /%INSTALL_DIR%/boot/syslinux/syslinux.cfg - APPEND /%INSTALL_DIR%/ 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 |