From 736671c208a82ee0abe22e676ffcb1a6591fff18 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 8 Dec 2022 21:51:59 +0100
Subject: [PATCH] adapt name changes to grub.cfg

---
 usr/share/archboot/doc/archboot.html           |  2 +-
 usr/share/archboot/grub/archboot-main-grub.cfg | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html
index 0d91f91ac..7a29fb11a 100644
--- a/usr/share/archboot/doc/archboot.html
+++ b/usr/share/archboot/doc/archboot.html
@@ -699,7 +699,7 @@ initrd (loop)/boot/initramfs_x86_64.img
 <ul>
 <li>Latest <a href="https://wiki.archlinux.org/title/Pacman" title="Pacman"><strong>pacman</strong></a> <a href="https://wiki.archlinux.org/title/Mirror" title="Mirror"><strong>mirrors</strong></a> will be synced and you have to select your favourite mirror.</li>
 <li>You will be asked if you want to activate the <a href="https://wiki.archlinux.org/title/Testing" title="Testing"><strong>testing</strong></a> repository.</li>
-<li>You can decide to load the latest archboot environment and cache packages for installation.</li>
+<li>If a new kernel is online available, you can decide to load the latest archboot environment and cache packages for installation.</li>
 </ul></li>
 </ul>
 <h4 data-number="2.10.4" id="changing-timezone-and-date"><span class="header-section-number">2.10.4</span> <strong><span dir="">Changing timezone and date</span></strong></h4>
diff --git a/usr/share/archboot/grub/archboot-main-grub.cfg b/usr/share/archboot/grub/archboot-main-grub.cfg
index 4d2f6eaf7..ed13d4688 100644
--- a/usr/share/archboot/grub/archboot-main-grub.cfg
+++ b/usr/share/archboot/grub/archboot-main-grub.cfg
@@ -36,28 +36,28 @@ function _menu_running {
 function _secure_boot_tools {
     menuentry "Secure Boot KeyTool" {
         _menu_running
-        chainloader /EFI/tools/KeyTool.efi
+        chainloader /EFI/TOOLS/KEYTOOL.EFI
     }
     menuentry "Secure Boot HashTool" {
         _menu_running
-        chainloader /EFI/tools/HashTool.efi
+        chainloader /EFI/TOOLS/HASHTOOL.EFI
     }
 }
 
 function _efi_shell {
     if [ ${grub_cpu} == "x86_64" ]; then
-        _EXT="x64"
+        _EXT="X64"
     elif [ ${grub_cpu} == "i386" ]; then
-        _EXT="ia32"
+        _EXT="IA32"
     fi
     menuentry "UEFI Shell version 2" {
         _menu_running
-        chainloader /EFI/tools/shell${_EXT}_v2.efi
+        chainloader /EFI/TOOLS/SHELL${_EXT}_V2.EFI
     }
 
     menuentry "UEFI Shell version 1" {
         _menu_running
-        chainloader /EFI/tools/shell${_EXT}_v1.efi
+        chainloader /EFI/TOOLS/SHELL${_EXT}_V1.EFI
     }
 }
 
@@ -127,12 +127,12 @@ if [ ${grub_platform} == "efi" ]; then
                 _initrd_x86_64
         }
         
-        submenu "UEFI Tools" {
+        submenu "UEFI Shells" {
             _efi_shell
         }
     fi
 
-    submenu "UEFI Tools" {
+    submenu "UEFI Secureboot Tools" {
         _secure_boot_tools
     }