summaryrefslogtreecommitdiff
path: root/configs/baseline/syslinux
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-12-02 16:33:08 -0300
committerDavid P <megver83@parabola.nu>2020-12-02 16:33:08 -0300
commitce23b5ac79cc6ff418eabe5303c8029e381b0a1c (patch)
tree57522d7be01f266dae658cf4b3ccdd15b0a2977a /configs/baseline/syslinux
parent39f2387cbc51e6ba634984931ea2de160c3c350a (diff)
sync with archisov50
Imported from archiso v50.1 8ba2870 (HEAD -> master, tag: v50.1, origin/master, origin/HEAD) configs/releng/syslinux/archiso_pxe-linux.cfg: add missing /boot to initrd file path Imported from archiso 50 c10004d (tag: v50) Fix issues with file ownerships/modes 863247d Keep all SYSLINUX files in /syslinux 183ae52 Prevent path traversal outside of $airootfs_dir 42d9e4f Allow specifying ownership and mode of custom airootfs files and directories 2c99df5 Reset network interfaces at the end of the PXE boot to allow DHCP to run Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/baseline/syslinux')
-rw-r--r--configs/baseline/syslinux/syslinux-linux-libre.cfg4
-rw-r--r--configs/baseline/syslinux/syslinux.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/configs/baseline/syslinux/syslinux-linux-libre.cfg b/configs/baseline/syslinux/syslinux-linux-libre.cfg
index e47c780..056be58 100644
--- a/configs/baseline/syslinux/syslinux-linux-libre.cfg
+++ b/configs/baseline/syslinux/syslinux-linux-libre.cfg
@@ -3,6 +3,6 @@
LABEL parabola
MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS)
-LINUX boot/%ARCH%/vmlinuz-linux-libre
-INITRD boot/%ARCH%/initramfs-linux-libre.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-libre
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-libre.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 5eb5adf..e965abb 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 Parabola GNU/Linux-libre
MENU CLEAR
DEFAULT parabola
TIMEOUT 30
-INCLUDE boot/syslinux/syslinux-linux-libre.cfg
+INCLUDE syslinux-linux-libre.cfg