From d7fcc9a8e8f0e285c35917c696049e2eb551420a Mon Sep 17 00:00:00 2001
From: lgromero <lgromero@qindel.com>
Date: Tue, 24 Jun 2025 13:44:54 +0200
Subject: [PATCH] refs #2218 removes efi partition hardcoded in templates

---
 tftpboot/menu.lst/templateDisk |  3 ++-
 tftpboot/menu.lst/templateMenu | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tftpboot/menu.lst/templateDisk b/tftpboot/menu.lst/templateDisk
index 5639364..5c37839 100755
--- a/tftpboot/menu.lst/templateDisk
+++ b/tftpboot/menu.lst/templateDisk
@@ -1,5 +1,6 @@
 if ! search --file --set root /Part-__DISK__-__PART__; then
     search --file --set root /EFI/Part-__DISK__-__PART__/Boot/ogloader.efi
 fi
-chainloader (hd0,gpt1)/EFI/Part-__DISK__-__PART__/Boot/ogloader.efi
+search --file --set rootEFI /EFI/Part-__DISK__-__PART__/Boot/ogloader.efi
+chainloader ($rootEFI)/EFI/Part-__DISK__-__PART__/Boot/ogloader.efi
 boot
\ No newline at end of file
diff --git a/tftpboot/menu.lst/templateMenu b/tftpboot/menu.lst/templateMenu
index b1a6f30..446a29d 100644
--- a/tftpboot/menu.lst/templateMenu
+++ b/tftpboot/menu.lst/templateMenu
@@ -22,23 +22,30 @@ if [ "$rootRefind" != "" ]; then
 }
 fi
 
-echo "Searching Part-01-02"
-search --file --set rootP2 /EFI/Part-01-02/Boot/ogloader.efi
+if ! search --file --set rootP2 /Part-01-02; then
+    search --file --set rootP2 /EFI/Part-01-02/Boot/ogloader.efi
+fi
+search --file --set rootEFI /EFI/Part-01-02/Boot/ogloader.efi
+
 if [ "$rootP2" != "" ]; then
     set detectado='si'
     menuentry "Part-01-02" {
         root="$rootP2"
-        chainloader /EFI/Part-01-02/Boot/ogloader.efi
+        chainloader ($rootEFI)/EFI/Part-01-02/Boot/ogloader.efi
     }
 fi
 
-echo "Searching Part-01-03"
-search --file --set rootP3 /EFI/Part-01-03/Boot/ogloader.efi
-if [ "$rootP3" != "" ]; then
+if ! search --file --set rootP3 /Part-01-03; then
+    search --file --set rootP3 /EFI/Part-01-03/Boot/ogloader.efi
+fi
+
+search --file --set rootEFI /EFI/Part-01-03/Boot/ogloader.efi
+
+if [ "$rootEFI" != "" ]; then
     set detectado='si'
     menuentry "Part-01-03" {
         root="$rootP3"
-        chainloader /EFI/Part-01-03/Boot/ogloader.efi
+        chainloader ($rootEFI)/EFI/Part-01-03/Boot/ogloader.efi
     }
 fi
 
-- 
2.40.1