From ce23b5ac79cc6ff418eabe5303c8029e381b0a1c Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 2 Dec 2020 16:33:08 -0300 Subject: sync with archiso 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 --- configs/lxde-openrc/syslinux/parabolaiso.cfg | 14 -------------- configs/lxde-openrc/syslinux/parabolaiso_head.cfg | 4 ++-- .../lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg | 12 ++++++------ .../lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg | 12 ++++++------ configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg | 6 +++--- configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg | 8 ++++---- configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg | 6 +++--- .../lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg | 4 ++-- .../lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg | 4 ++-- configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg | 6 +++--- configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg | 8 ++++---- configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg | 6 +++--- configs/lxde-openrc/syslinux/parabolaiso_tail.cfg | 12 ++++++------ configs/lxde-openrc/syslinux/syslinux.cfg | 14 ++++++++++---- 14 files changed, 54 insertions(+), 62 deletions(-) delete mode 100644 configs/lxde-openrc/syslinux/parabolaiso.cfg (limited to 'configs/lxde-openrc/syslinux') diff --git a/configs/lxde-openrc/syslinux/parabolaiso.cfg b/configs/lxde-openrc/syslinux/parabolaiso.cfg deleted file mode 100644 index e38642c..0000000 --- a/configs/lxde-openrc/syslinux/parabolaiso.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -DEFAULT select - -LABEL select -COM32 boot/syslinux/whichsys.c32 -APPEND -pxe- pxe -sys- sys -iso- sys - -LABEL pxe -CONFIG boot/syslinux/parabolaiso_pxe_choose.cfg - -LABEL sys -CONFIG boot/syslinux/parabolaiso_sys_choose.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg index f1f7635..d3c18d6 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg @@ -2,9 +2,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later SERIAL 0 38400 -UI boot/syslinux/vesamenu.c32 +UI vesamenu.c32 MENU TITLE Parabola GNU/Linux-libre -MENU BACKGROUND boot/syslinux/splash.png +MENU BACKGROUND splash.png MENU WIDTH 78 MENU MARGIN 4 diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg index 2cc63f1..8f1a5ac 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg @@ -7,8 +7,8 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -18,8 +18,8 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -29,7 +29,7 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg index 0fd9fa6..3e46234 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg @@ -7,8 +7,8 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -18,8 +18,8 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 @@ -29,7 +29,7 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg index c5c00e6..6b0cd85 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg @@ -1,6 +1,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_pxe32.cfg -INCLUDE boot/syslinux/parabolaiso_tail.cfg +INCLUDE parabolaiso_head.cfg +INCLUDE parabolaiso_pxe32.cfg +INCLUDE parabolaiso_tail.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg index 0c5be94..ea72b27 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_pxe64.cfg -INCLUDE boot/syslinux/parabolaiso_pxe32.cfg -INCLUDE boot/syslinux/parabolaiso_tail.cfg +INCLUDE parabolaiso_head.cfg +INCLUDE parabolaiso_pxe64.cfg +INCLUDE parabolaiso_pxe32.cfg +INCLUDE parabolaiso_tail.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg index 079fd7d..ad5a822 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg @@ -4,11 +4,11 @@ DEFAULT choose LABEL choose -COM32 boot/syslinux/ifcpu64.c32 +COM32 ifcpu64.c32 APPEND have64 -- nohave64 LABEL have64 -CONFIG boot/syslinux/parabolaiso_pxe_both_inc.cfg +CONFIG parabolaiso_pxe_both_inc.cfg LABEL nohave64 -CONFIG boot/syslinux/parabolaiso_pxe_32_inc.cfg +CONFIG parabolaiso_pxe_32_inc.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index 80fcca0..2729002 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -9,6 +9,6 @@ Boot the Parabola GNU/Linux-libre (i686) live medium. It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) -LINUX boot/i686/vmlinuz-linux-libre -INITRD boot/i686/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index 853bb8d..25f43c2 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -10,6 +10,6 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium. It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) -LINUX boot/x86_64/vmlinuz-linux-libre -INITRD boot/x86_64/initramfs-linux-libre.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg index 402ab61..99f22cf 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg @@ -1,6 +1,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_sys32-linux-libre.cfg -INCLUDE boot/syslinux/parabolaiso_tail.cfg +INCLUDE parabolaiso_head.cfg +INCLUDE parabolaiso_sys32-linux-libre.cfg +INCLUDE parabolaiso_tail.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg index 0febc5a..cd77b43 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -INCLUDE boot/syslinux/parabolaiso_head.cfg -INCLUDE boot/syslinux/parabolaiso_sys64-linux-libre.cfg -INCLUDE boot/syslinux/parabolaiso_sys32-linux-libre.cfg -INCLUDE boot/syslinux/parabolaiso_tail.cfg +INCLUDE parabolaiso_head.cfg +INCLUDE parabolaiso_sys64-linux-libre.cfg +INCLUDE parabolaiso_sys32-linux-libre.cfg +INCLUDE parabolaiso_tail.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg index 2d41bb9..cf814d9 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg @@ -4,11 +4,11 @@ DEFAULT choose LABEL choose -COM32 boot/syslinux/ifcpu64.c32 +COM32 ifcpu64.c32 APPEND have64 -- nohave64 LABEL have64 -CONFIG boot/syslinux/parabolaiso_sys_both_inc.cfg +CONFIG parabolaiso_sys_both_inc.cfg LABEL nohave64 -CONFIG boot/syslinux/parabolaiso_sys_32_inc.cfg +CONFIG parabolaiso_sys_32_inc.cfg diff --git a/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg b/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg index 685e1c8..f7a27a2 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg @@ -7,19 +7,19 @@ Boot an existing operating system. Press TAB to edit the disk and partition number to boot. ENDTEXT MENU LABEL Boot existing OS -COM32 boot/syslinux/chain.c32 +COM32 chain.c32 APPEND hd0 0 # http://www.memtest.org/ LABEL memtest MENU LABEL Run Memtest86+ (RAM test) -LINUX boot/memtest +LINUX /%INSTALL_DIR%/boot/memtest # http://hdt-project.org/ LABEL hdt MENU LABEL Hardware Information (HDT) -COM32 boot/syslinux/hdt.c32 -APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz +COM32 hdt.c32 +APPEND modules_alias=hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz LABEL reboot TEXT HELP @@ -27,7 +27,7 @@ Reboot computer. The computer's firmware must support APM. ENDTEXT MENU LABEL Reboot -COM32 boot/syslinux/reboot.c32 +COM32 reboot.c32 LABEL poweroff TEXT HELP @@ -35,4 +35,4 @@ Power off computer. The computer's firmware must support APM. ENDTEXT MENU LABEL Power Off -COM32 boot/syslinux/poweroff.c32 +COM32 poweroff.c32 diff --git a/configs/lxde-openrc/syslinux/syslinux.cfg b/configs/lxde-openrc/syslinux/syslinux.cfg index f0239ac..7cb63ed 100644 --- a/configs/lxde-openrc/syslinux/syslinux.cfg +++ b/configs/lxde-openrc/syslinux/syslinux.cfg @@ -1,8 +1,14 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -DEFAULT loadconfig +DEFAULT select -LABEL loadconfig - CONFIG parabolaiso.cfg - APPEND ../../ +LABEL select +COM32 whichsys.c32 +APPEND -pxe- pxe -sys- sys -iso- sys + +LABEL pxe +CONFIG parabolaiso_pxe_choose.cfg + +LABEL sys +CONFIG parabolaiso_sys_choose.cfg -- cgit v1.2.2