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:
authornl6720 <nl6720@gmail.com>2020-09-03 00:03:38 +0300
committernl6720 <nl6720@gmail.com>2020-09-27 20:54:11 +0300
commit83e4cb9fb9934611e0508ac4e6ee97a1a0bd2ffc (patch)
treeb480ac4bef836af10288639faa56c690e3a43031 /configs/releng/efiboot/loader
parent136152e672d56fd624a56a32af6f584f66fc50dc (diff)
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 .
Diffstat (limited to 'configs/releng/efiboot/loader')
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf9
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf (renamed from configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf)0
-rw-r--r--configs/releng/efiboot/loader/loader.conf2
3 files changed, 1 insertions, 10 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
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-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
index 1a14b11..1a14b11 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
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