[remove] : custom UEFI shell (archiso 45)

Removing custom UEFI shell boot loader configs

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.

diff --git a/build.sh b/build.sh
index 1664ba8..a7d7af0 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1062,8 +1062,6 @@ 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|%OS_NAME%|${os_name}|g;
@@ -1071,8 +1069,8 @@ make_efi() {
         "${script_path}/efiboot/loader/entries/usb/archiso-x86_64-usb-${kernel}.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
@@ -1101,8 +1099,6 @@ 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;
@@ -1110,8 +1106,8 @@ make_efiboot() {
          s|%INSTALL_DIR%|${install_dir}|g" \
         "${script_path}/efiboot/loader/entries/cd/archiso-x86_64-cd-${kernel}.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/efiboot/loader/entries/uefi-shell-full-x86_64.conf b/efiboot/loader/entries/uefi-shell-full-x86_64.conf
deleted file mode 100644 (file)
index 26521cb..0000000
--- a/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
\ No newline at end of file

diff --git a/efiboot/loader/entries/uefi-shell-x86_64.conf b/efiboot/loader/entries/uefi-shell-x86_64.conf
deleted file mode 100644 (file)
index 54b7a98..0000000
--- a/efiboot/loader/entries/uefi-shell-x86_64.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-title  UEFI Shell x86_64
-efi    /EFI/Shell_x64.efi
\ No newline at end of file