Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-05-28 15:31:10 +0300
committernl6720 <nl6720@gmail.com>2022-05-28 15:31:10 +0300
commitf4e2d68599029c364a8330aa00b4391b99b9ae40 (patch)
tree97c2e31fd3c5dcb2419ec33ded29ad0040cafb65
parent376e9282da7492cbc00d28c95b5540c17dd80716 (diff)
parent2a1f44bbbf79a63f4889b31c87b41743abe40f11 (diff)
Merge remote-tracking branch 'origin/merge-requests/254'
By Alexander Epaneshnikov * origin/merge-requests/254: fix boot menu entry sorting add accessible copytoram entry enable beeps in boot menu See merge request !254
-rw-r--r--configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf13
-rw-r--r--configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf13
-rw-r--r--configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf13
-rw-r--r--configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf7
-rw-r--r--configs/releng/efiboot/loader/loader.conf1
5 files changed, 29 insertions, 18 deletions
diff --git a/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index d59262f..1c2a7a8 100644
--- a/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,6 +1,7 @@
-title Arch Linux install medium (x86_64, UEFI)
-linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd /%INSTALL_DIR%/boot/intel-ucode.img
-initrd /%INSTALL_DIR%/boot/amd-ucode.img
-initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+title Arch Linux install medium (x86_64, UEFI)
+sort-key 01
+linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd /%INSTALL_DIR%/boot/intel-ucode.img
+initrd /%INSTALL_DIR%/boot/amd-ucode.img
+initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
index 06f5466..64253d3 100644
--- a/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
+++ b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
@@ -1,6 +1,7 @@
-title Arch Linux install medium (x86_64, UEFI) with speech
-linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd /%INSTALL_DIR%/boot/intel-ucode.img
-initrd /%INSTALL_DIR%/boot/amd-ucode.img
-initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
+title Arch Linux install medium (x86_64, UEFI) with speech
+sort-key 02
+linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd /%INSTALL_DIR%/boot/intel-ucode.img
+initrd /%INSTALL_DIR%/boot/amd-ucode.img
+initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
diff --git a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
index 9c7a51a..3e26651 100644
--- a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
+++ b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
@@ -1,6 +1,7 @@
-title Arch Linux install medium (x86_64, UEFI, Copy to RAM)
-linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd /%INSTALL_DIR%/boot/intel-ucode.img
-initrd /%INSTALL_DIR%/boot/amd-ucode.img
-initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
+title Arch Linux install medium (x86_64, UEFI, Copy to RAM)
+sort-key 03
+linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd /%INSTALL_DIR%/boot/intel-ucode.img
+initrd /%INSTALL_DIR%/boot/amd-ucode.img
+initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
diff --git a/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf b/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
new file mode 100644
index 0000000..0d67999
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
@@ -0,0 +1,7 @@
+title Arch Linux install medium (x86_64, UEFI, Copy to RAM) with speech
+sort-key 04
+linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd /%INSTALL_DIR%/boot/intel-ucode.img
+initrd /%INSTALL_DIR%/boot/amd-ucode.img
+initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram accessibility=on
diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf
index ae63487..2d137aa 100644
--- a/configs/releng/efiboot/loader/loader.conf
+++ b/configs/releng/efiboot/loader/loader.conf
@@ -1,2 +1,3 @@
timeout 15
default 01-archiso-x86_64-linux.conf
+beep on