From f3e077a21cf87e3acbc692081a59f422f9d3ca9e Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 28 Sep 2020 14:39:20 -0300 Subject: sync with archiso Imported changes: f34c957 (HEAD -> master, origin/master, origin/HEAD) Calculate required efiboot.img size instead of hardcoding it 8c04704 Split SYSLINUX configuration into per-kernel configuration files 8276616 archiso/mkarchiso: do not hardcode the kernel and initramfs file names 83e4cb9 Use the same file paths in both ISO 9660 and FAT 136152e Do not rename the initramfs image Signed-off-by: David P --- configs/baseline/syslinux/syslinux.cfg | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'configs/baseline/syslinux/syslinux.cfg') diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 3f7a85d..5eb5adf 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -8,8 +8,4 @@ MENU CLEAR DEFAULT parabola TIMEOUT 30 -LABEL parabola -MENU LABEL Parabola GNU/Linux-libre -LINUX boot/%ARCH%/vmlinuz-linux-libre -INITRD boot/%ARCH%/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +INCLUDE boot/syslinux/syslinux-linux-libre.cfg -- cgit v1.2.2