Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng/efiboot/loader
diff options
context:
space:
mode:
Diffstat (limited to 'configs/releng/efiboot/loader')
-rw-r--r--configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf6
-rw-r--r--configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf6
-rw-r--r--configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf6
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf6
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf6
-rw-r--r--configs/releng/efiboot/loader/loader.conf4
6 files changed, 20 insertions, 14 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
new file mode 100644
index 0000000..d59262f
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -0,0 +1,6 @@
+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%
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
new file mode 100644
index 0000000..06f5466
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf
@@ -0,0 +1,6 @@
+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
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
new file mode 100644
index 0000000..9c7a51a
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
@@ -0,0 +1,6 @@
+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
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
deleted file mode 100644
index 7f5c81b..0000000
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-initrd /EFI/archiso/archiso.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
deleted file mode 100644
index e1d156a..0000000
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-initrd /%INSTALL_DIR%/boot/x86_64/archiso.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf
index 9a0049c..ae63487 100644
--- a/configs/releng/efiboot/loader/loader.conf
+++ b/configs/releng/efiboot/loader/loader.conf
@@ -1,2 +1,2 @@
-timeout 3
-default archiso-x86_64.conf
+timeout 15
+default 01-archiso-x86_64-linux.conf