From 8c047047ab62597d6ced826136bd97df5bf1598c Mon Sep 17 00:00:00 2001 From: nl6720 Date: Mon, 14 Sep 2020 09:34:01 +0300 Subject: [PATCH] Split SYSLINUX configuration into per-kernel configuration files Slightly simplifies adding boot loader configuration for more kernels. Unfortunately the INCLUDE statement doesn't support wildcards, so each new file must be manually included in the main syslinux configuration file (syslinux.cfg for baseline and archiso_sys.cfg for releng). --- configs/baseline/syslinux/syslinux-linux.cfg | 8 +++++ configs/baseline/syslinux/syslinux.cfg | 6 +--- configs/releng/syslinux/archiso_pxe-linux.cfg | 35 +++++++++++++++++++ configs/releng/syslinux/archiso_pxe.cfg | 33 +---------------- configs/releng/syslinux/archiso_sys-linux.cfg | 12 +++++++ configs/releng/syslinux/archiso_sys.cfg | 10 +----- 6 files changed, 58 insertions(+), 46 deletions(-) create mode 100644 configs/baseline/syslinux/syslinux-linux.cfg create mode 100644 configs/releng/syslinux/archiso_pxe-linux.cfg create mode 100644 configs/releng/syslinux/archiso_sys-linux.cfg diff --git a/configs/baseline/syslinux/syslinux-linux.cfg b/configs/baseline/syslinux/syslinux-linux.cfg new file mode 100644 index 0000000..c4b015b --- /dev/null +++ b/configs/baseline/syslinux/syslinux-linux.cfg @@ -0,0 +1,8 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL arch +MENU LABEL Arch Linux +LINUX boot/%ARCH%/vmlinuz-linux +INITRD boot/%ARCH%/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index d7396b8..c021a0e 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -8,8 +8,4 @@ MENU CLEAR DEFAULT arch TIMEOUT 30 -LABEL arch -MENU LABEL Arch Linux -LINUX boot/%ARCH%/vmlinuz-linux -INITRD boot/%ARCH%/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +INCLUDE boot/syslinux/syslinux-linux.cfg diff --git a/configs/releng/syslinux/archiso_pxe-linux.cfg b/configs/releng/syslinux/archiso_pxe-linux.cfg new file mode 100644 index 0000000..aa4bc2a --- /dev/null +++ b/configs/releng/syslinux/archiso_pxe-linux.cfg @@ -0,0 +1,35 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL arch64_nbd +TEXT HELP +Boot the Arch Linux install medium using NBD. +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, NBD) +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify +SYSAPPEND 3 + +LABEL arch64_nfs +TEXT HELP +Boot the Arch Linux live medium using NFS. +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, NFS) +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify +SYSAPPEND 3 + +LABEL arch64_http +TEXT HELP +Boot the Arch Linux live medium using HTTP. +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, HTTP) +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify +SYSAPPEND 3 diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index e51b55a..202ed7a 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -3,37 +3,6 @@ INCLUDE boot/syslinux/archiso_head.cfg -LABEL arch64_nbd -TEXT HELP -Boot the Arch Linux install medium using NBD. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NBD) -LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify -SYSAPPEND 3 - -LABEL arch64_nfs -TEXT HELP -Boot the Arch Linux live medium using NFS. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NFS) -LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify -SYSAPPEND 3 - -LABEL arch64_http -TEXT HELP -Boot the Arch Linux live medium using HTTP. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, HTTP) -LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify -SYSAPPEND 3 +INCLUDE boot/syslinux/archiso_pxe-linux.cfg INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg new file mode 100644 index 0000000..6d0186b --- /dev/null +++ b/configs/releng/syslinux/archiso_sys-linux.cfg @@ -0,0 +1,12 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +LABEL arch64 +TEXT HELP +Boot the Arch Linux install medium on BIOS. +It allows you to install Arch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Arch Linux install medium (x86_64, BIOS) +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index 6e8d9e3..8a61d49 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -6,14 +6,6 @@ INCLUDE boot/syslinux/archiso_head.cfg DEFAULT arch64 TIMEOUT 30 -LABEL arch64 -TEXT HELP -Boot the Arch Linux install medium on BIOS. -It allows you to install Arch Linux or perform system maintenance. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, BIOS) -LINUX boot/x86_64/vmlinuz-linux -INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +INCLUDE boot/syslinux/archiso_sys-linux.cfg INCLUDE boot/syslinux/archiso_tail.cfg