Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng/syslinux
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-09-14 09:34:01 +0300
committernl6720 <nl6720@gmail.com>2020-09-27 20:54:11 +0300
commit8c047047ab62597d6ced826136bd97df5bf1598c (patch)
tree1413b40648606aab09d1078456086f11049a376f /configs/releng/syslinux
parent8276616f6f0480464b2dabf508b3592f19d2ebc2 (diff)
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).
Diffstat (limited to 'configs/releng/syslinux')
-rw-r--r--configs/releng/syslinux/archiso_pxe-linux.cfg35
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg33
-rw-r--r--configs/releng/syslinux/archiso_sys-linux.cfg12
-rw-r--r--configs/releng/syslinux/archiso_sys.cfg10
4 files changed, 49 insertions, 41 deletions
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