Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng/efiboot/loader/entries
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2020-07-28 11:38:04 +0200
committerDavid Runge <dvzrv@archlinux.org>2020-07-28 12:13:45 +0200
commit47e11125e4672fc3448caefa6728439160daedd3 (patch)
tree2b25a8ef2423b86ea51caa47bcb2783deaa94876 /configs/releng/efiboot/loader/entries
parentba6b44f80a4a48c0b66068a32a8596b4d4fc28d8 (diff)
Copy files more generically
configs/*: Copy all files that do not need a rename generically (not specifying a destination file name). Do not rename vmlinuz-linux to vmlinuz or vmlinuz.efi (as this serves no purpose and makes the scripts more complicated). Do not rename microcode (i.e. {amd,intel}-ucode.img) when copying them and change all boot loader configuration files that assume a renamed microcode image. Add note and link to Arch Linux wiki to state why memtest.bin is renamed to memtest. Copy license files for {amd,intel}-ucode and memtest more generically by placing them into subdirectories with the same name as the package (to circumenvent overwriting one other). Closes #33
Diffstat (limited to 'configs/releng/efiboot/loader/entries')
-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
2 files changed, 6 insertions, 6 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 7f5c81b..b660f1d 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -1,6 +1,6 @@
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
+linux /EFI/archiso/vmlinuz-linux
+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
index e1d156a..78c7d23 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -1,6 +1,6 @@
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
+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/archiso.img
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%