From 47e11125e4672fc3448caefa6728439160daedd3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 28 Jul 2020 11:38:04 +0200 Subject: 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 --- configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf | 6 +++--- configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'configs/releng/efiboot/loader/entries') 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% -- cgit v1.2.3-70-g09d2