From 0056806faa5a5ffa248f0458efa3f865fa57d6b3 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 24 Oct 2020 18:55:50 -0300 Subject: sync with archiso Imported changes: cc2d9bb (HEAD -> master, origin/master, origin/HEAD) run_archiso: add braille support ae0e914 configs/baseline: support UEFI f3af569 (origin/issues/73) Set CacheDir and HookDir for profile more sanely 729d16b Move FAT image to a separate partition outside the ISO 9660 file system Due to commit f3af569, I made the following changes: * run _make_pacman_conf for both architectures * _make_pacman_conf: create a pacman.conf file for each architecture * _pacman: remove --arch flag since the pacman.conf specifies the arch Signed-off-by: David P --- .../efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf | 7 +++++++ configs/baseline/efiboot/loader/loader.conf | 5 +++++ configs/baseline/profiledef.sh | 2 +- configs/baseline/syslinux/syslinux-linux-libre.cfg | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf create mode 100644 configs/baseline/efiboot/loader/loader.conf (limited to 'configs') diff --git a/configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf b/configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf new file mode 100644 index 0000000..99bc0be --- /dev/null +++ b/configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/baseline/efiboot/loader/loader.conf b/configs/baseline/efiboot/loader/loader.conf new file mode 100644 index 0000000..99b52a9 --- /dev/null +++ b/configs/baseline/efiboot/loader/loader.conf @@ -0,0 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +timeout 3 +default parabolaiso-x86_64-linux-libre.conf diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh index 4a05474..c922493 100644 --- a/configs/baseline/profiledef.sh +++ b/configs/baseline/profiledef.sh @@ -7,6 +7,6 @@ iso_publisher="Parabola GNU/Linux-libre " iso_application="Parabola GNU/Linux-libre baseline" iso_version="$(date +%Y.%m.%d)" install_dir="parabola" -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito') +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" diff --git a/configs/baseline/syslinux/syslinux-linux-libre.cfg b/configs/baseline/syslinux/syslinux-linux-libre.cfg index af7fbb6..e47c780 100644 --- a/configs/baseline/syslinux/syslinux-linux-libre.cfg +++ b/configs/baseline/syslinux/syslinux-linux-libre.cfg @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later LABEL parabola -MENU LABEL Parabola GNU/Linux-libre +MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS) LINUX boot/%ARCH%/vmlinuz-linux-libre INITRD boot/%ARCH%/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% -- cgit v1.2.2