From ae0e914114d2ff84e43b4da3b1b2bf855cff01d3 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sun, 4 Oct 2020 17:48:15 +0300 Subject: [PATCH] configs/baseline: support UEFI --- .../efiboot/loader/entries/archiso-x86_64-linux.conf | 7 +++++++ configs/baseline/efiboot/loader/loader.conf | 5 +++++ configs/baseline/profiledef.sh | 2 +- configs/baseline/syslinux/syslinux-linux.cfg | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 configs/baseline/efiboot/loader/entries/archiso-x86_64-linux.conf create mode 100644 configs/baseline/efiboot/loader/loader.conf diff --git a/configs/baseline/efiboot/loader/entries/archiso-x86_64-linux.conf b/configs/baseline/efiboot/loader/entries/archiso-x86_64-linux.conf new file mode 100644 index 0000000..8dd7a16 --- /dev/null +++ b/configs/baseline/efiboot/loader/entries/archiso-x86_64-linux.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Arch Linux (x86_64, UEFI) +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/baseline/efiboot/loader/loader.conf b/configs/baseline/efiboot/loader/loader.conf new file mode 100644 index 0000000..1ea5ce5 --- /dev/null +++ b/configs/baseline/efiboot/loader/loader.conf @@ -0,0 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +timeout 3 +default archiso-x86_64-linux.conf diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh index 9ced69e..2efd38f 100644 --- a/configs/baseline/profiledef.sh +++ b/configs/baseline/profiledef.sh @@ -7,6 +7,6 @@ iso_publisher="Arch Linux " iso_application="Arch Linux baseline" iso_version="$(date +%Y.%m.%d)" install_dir="arch" -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.cfg b/configs/baseline/syslinux/syslinux-linux.cfg index c4b015b..21dfbd7 100644 --- a/configs/baseline/syslinux/syslinux-linux.cfg +++ b/configs/baseline/syslinux/syslinux-linux.cfg @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later LABEL arch -MENU LABEL Arch Linux +MENU LABEL Arch Linux (x86_64, BIOS) LINUX boot/%ARCH%/vmlinuz-linux INITRD boot/%ARCH%/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%