Merge branch 'upstreamMaster'

2 files changed, 0 insertions, 14 deletions

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
deleted file mode 100644
index 3e26651..0000000
--- a/configs/releng/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-title    Arch Linux install medium (x86_64, UEFI, Copy to RAM)
-sort-key 03
-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/04-archiso-x86_64-ram-speech-linux.conf b/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
deleted file mode 100644
index 0d67999..0000000
--- a/configs/releng/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-title    Arch Linux install medium (x86_64, UEFI, Copy to RAM) with speech
-sort-key 04
-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 accessibility=on