From 9805bac57ebabc38f7c82d57f2aeebf943f8bfda Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 8 Feb 2023 12:11:33 +0100
Subject: [PATCH] fix grub menu entries

---
 .../archboot/grub/archboot-main-grub.cfg      | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/usr/share/archboot/grub/archboot-main-grub.cfg b/usr/share/archboot/grub/archboot-main-grub.cfg
index ee0b50bf5..bee6deb53 100644
--- a/usr/share/archboot/grub/archboot-main-grub.cfg
+++ b/usr/share/archboot/grub/archboot-main-grub.cfg
@@ -37,24 +37,30 @@ function _menu_running {
 function _secure_boot_tools {
     menuentry "Secure Boot KeyTool" {
         _menu_running
-        chainloader /EFI/TOOLS/KEYTOOL.EFI
+        search --no-floppy --set=root --file /efi/boot/VMLINUZ_X64
+        chainloader /boot/tools/keytool.efi
     }
     menuentry "Secure Boot HashTool" {
         _menu_running
-        chainloader /EFI/TOOLS/HASHTOOL.EFI
+        search --no-floppy --set=root --file /efi/boot/VMLINUZ_X64
+        chainloader /boot/tools/hashtool.efi
     }
 }
 
 function _efi_shell {
     if [ ${grub_cpu} == "x86_64" ]; then
-        _EXT="X64"
+        menuentry "UEFI Shell" {
+            _menu_running
+            search --no-floppy --set=root --file /efi/boot/VMLINUZ_X64
+            chainloader /boot/tools/shellx64.efi
+        }
     elif [ ${grub_cpu} == "i386" ]; then
-        _EXT="IA32"
+        menuentry "UEFI Shell" {
+            _menu_running
+            search --no-floppy --set=root --file /efi/boot/VMLINUZ_X64
+            chainloader /boot/tools/shellx64.efi
+        }
     fi
-    menuentry "UEFI Shell" {
-        _menu_running
-        chainloader /EFI/TOOLS/SHELL${_EXT}.EFI
-    }
 }
 
 if [ ${grub_platform} == "pc" ]; then
@@ -64,7 +70,6 @@ if [ ${grub_platform} == "pc" ]; then
         linux /boot/vmlinuz-x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0 audit=0
         initrd /boot/intel-ucode.img  /boot/amd-ucode.img /boot/initramfs-x86_64.img
     }
-
     menuentry "Memory Tester (memtest86+)" {
         _menu_running
         linux16 /boot/memtest.bin
@@ -96,20 +101,18 @@ if [ ${grub_platform} == "efi" ]; then
         }
         _efi_shell
     fi
-
     submenu "UEFI Secureboot Tools" {
         _secure_boot_tools
     }
-
     menuentry "Enter Firmware Setup" {
         _menu_running
         fwsetup
     }
-
     if [ ${grub_cpu} == "x86_64" ]; then
         menuentry "Memory Tester (memtest86+)" {
             _menu_running
-            linux /EFI/TOOLS/MEMTEST.EFI
+            search --no-floppy --set=root --file /efi/boot/VMLINUZ_X64
+            linux /boot/tools/memtest.efi
         }
     fi
 fi