diff options
| author | David P <megver83@parabola.nu> | 2020-12-02 16:33:08 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2020-12-02 16:33:08 -0300 |
| commit | ce23b5ac79cc6ff418eabe5303c8029e381b0a1c (patch) | |
| tree | 57522d7be01f266dae658cf4b3ccdd15b0a2977a /configs/baseline | |
| parent | 39f2387cbc51e6ba634984931ea2de160c3c350a (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')
| -rw-r--r-- | configs/baseline/isolinux/isolinux.cfg | 9 | ||||
| -rw-r--r-- | configs/baseline/profiledef.sh | 3 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux-linux-libre.cfg | 4 | ||||
| -rw-r--r-- | configs/baseline/syslinux/syslinux.cfg | 4 |
4 files changed, 7 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/profiledef.sh b/configs/baseline/profiledef.sh index c922493..8a3dbb4 100644 --- a/configs/baseline/profiledef.sh +++ b/configs/baseline/profiledef.sh @@ -10,3 +10,6 @@ install_dir="parabola" bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" +file_permissions=( + ["/etc/shadow"]="0:0:400" +) 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 |