From 2d4b9f3e341c9e61d3728fc7308ec19f238d3323 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Tue, 23 Jun 2020 20:44:29 +0200
Subject: Removing custom UEFI shell boot loader configs

configs/releng/build.sh:
Copying the edk2-shell based Shell_Full.efi to the root of the iso/ efi
image as 'shellx64.efi' is automatically picked up by certain hardware
and by systemd-boot.
This makes all custom UEFI shell configuration obsolete.

configs/releng/efiboot/loader/entries/uefi-shell-*.conf:
Removing obsolete custom UEFI shell boot loader configuration.

Closes #14
---
 configs/releng/build.sh                                      | 12 ++++--------
 .../efiboot/loader/entries/uefi-shell-full-x86_64.conf       |  2 --
 configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf |  2 --
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf
 delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 9e3a3a0..bd67554 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -157,16 +157,14 @@ make_efi() {
 
     mkdir -p ${work_dir}/iso/loader/entries
     cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
-    cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/iso/loader/entries/
-    cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/iso/loader/entries/
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g" \
         ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf
 
     # edk2-shell based UEFI shell
-    cp /usr/share/edk2-shell/x64/Shell.efi ${work_dir}/iso/EFI/Shell_x64.efi
-    cp /usr/share/edk2-shell/x64/Shell_Full.efi ${work_dir}/iso/EFI/Shell_Full_x64.efi
+    # shellx64.efi is picked up automatically when on /
+    cp /usr/share/edk2-shell/x64/Shell_Full.efi ${work_dir}/iso/shellx64.efi
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -190,15 +188,13 @@ make_efiboot() {
 
     mkdir -p ${work_dir}/efiboot/loader/entries
     cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/
-    cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/loader/entries/
-    cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/efiboot/loader/entries/
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g" \
         ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf
 
-    cp ${work_dir}/iso/EFI/Shell_x64.efi ${work_dir}/efiboot/EFI/
-    cp ${work_dir}/iso/EFI/Shell_Full_x64.efi ${work_dir}/efiboot/EFI/
+    # shellx64.efi is picked up automatically when on /
+    cp ${work_dir}/iso/shellx64.efi ${work_dir}/efiboot/
 
     umount -d ${work_dir}/efiboot
 }
diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf
deleted file mode 100644
index 054fa52..0000000
--- a/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-title  UEFI Shell (Full) x86_64
-efi    /EFI/Shell_Full_x64.efi
diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf
deleted file mode 100644
index b5dfbf2..0000000
--- a/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-title  UEFI Shell x86_64
-efi    /EFI/Shell_x64.efi
-- 
cgit v1.2.3-54-g00ecf