From 83e4cb9fb9934611e0508ac4e6ee97a1a0bd2ffc Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 3 Sep 2020 00:03:38 +0300 Subject: Use the same file paths in both ISO 9660 and FAT This allows to use only one systemd-boot configuration file per kernel. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/44 . --- configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf | 9 --------- configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf | 9 +++++++++ configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 9 --------- configs/releng/efiboot/loader/loader.conf | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf (limited to 'configs') 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 a706064..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title Arch Linux install medium (x86_64, UEFI) -linux /EFI/archiso/vmlinuz-linux -initrd /EFI/archiso/intel-ucode.img -initrd /EFI/archiso/amd-ucode.img -initrd /EFI/archiso/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf new file mode 100644 index 0000000..1a14b11 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +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/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf deleted file mode 100644 index 1a14b11..0000000 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -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/loader.conf b/configs/releng/efiboot/loader/loader.conf index fd7db27..1ea5ce5 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 3 -default archiso-x86_64.conf +default archiso-x86_64-linux.conf -- cgit v1.2.3-54-g00ecf