summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2020-06-30 13:00:42 +0200
committerDavid Runge <dvzrv@archlinux.org>2020-06-30 14:57:26 +0200
commitb08f1681cfafa7a24069acfefdf4b1c18d4e1d3c (patch)
treea16209357453e70806eee7ab71f463f79828f4e7 /configs
parent609e98847bf3ad95525daf8288096ea762e7cd23 (diff)
downloadarchiso32-b08f1681cfafa7a24069acfefdf4b1c18d4e1d3c.tar.xz
Standardizing boot loader entry format
{configs/releng/efiboot/loader/entries/archiso-x86_64-{cd,usb}.conf,configs/releng/syslinux/archiso_{pxe,sys}.cfg}: Standardizing the boot loader entry format by switching all entries to the form: "Arch Linux install medium (<CARCH>[, <PROPERTY>])". This removes the distinction between "CD" and "USB" when booting in UEFI "el-torito" (as the information is not useful). Changing some of the syslinux help text as well to reflect this change. This also drops the specific <CARCH> from the syslinux help text as it is duplicated information. Closes #24
Diffstat (limited to 'configs')
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf2
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf2
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg12
-rw-r--r--configs/releng/syslinux/archiso_sys.cfg4
4 files changed, 10 insertions, 10 deletions
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
index b77ed98..7f5c81b 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -1,4 +1,4 @@
-title Arch Linux archiso x86_64 UEFI CD
+title Arch Linux install medium (x86_64, UEFI)
linux /EFI/archiso/vmlinuz.efi
initrd /EFI/archiso/intel_ucode.img
initrd /EFI/archiso/amd_ucode.img
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
index 09adca4..e1d156a 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -1,4 +1,4 @@
-title Arch Linux archiso x86_64 UEFI USB
+title Arch Linux install medium (x86_64, UEFI)
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz
initrd /%INSTALL_DIR%/boot/intel_ucode.img
initrd /%INSTALL_DIR%/boot/amd_ucode.img
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index 92af749..3ae0948 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -2,10 +2,10 @@ INCLUDE boot/syslinux/archiso_head.cfg
LABEL arch64_nbd
TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using NBD).
+Boot the Arch Linux install medium using NBD.
It allows you to install Arch Linux or perform system maintenance.
ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (NBD)
+MENU LABEL Arch Linux install medium (x86_64, NBD)
LINUX boot/x86_64/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
@@ -13,10 +13,10 @@ SYSAPPEND 3
LABEL arch64_nfs
TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using NFS).
+Boot the Arch Linux live medium using NFS.
It allows you to install Arch Linux or perform system maintenance.
ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (NFS)
+MENU LABEL Arch Linux install medium (x86_64, NFS)
LINUX boot/x86_64/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
@@ -24,10 +24,10 @@ SYSAPPEND 3
LABEL arch64_http
TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using HTTP).
+Boot the Arch Linux live medium using HTTP.
It allows you to install Arch Linux or perform system maintenance.
ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (HTTP)
+MENU LABEL Arch Linux install medium (x86_64, HTTP)
LINUX boot/x86_64/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
index a35a1ea..dd6e03f 100644
--- a/configs/releng/syslinux/archiso_sys.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -2,10 +2,10 @@ INCLUDE boot/syslinux/archiso_head.cfg
LABEL arch64
TEXT HELP
-Boot the Arch Linux (x86_64) live medium.
+Boot the Arch Linux install medium on BIOS.
It allows you to install Arch Linux or perform system maintenance.
ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64)
+MENU LABEL Arch Linux install medium (x86_64, BIOS)
LINUX boot/x86_64/vmlinuz
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%