From b1300359aec362eb3586e061aca54695153bffd3 Mon Sep 17 00:00:00 2001
From: "Tucker R. Twomey" <tucker@the-twomeys.com>
Date: Mon, 30 Mar 2026 01:52:08 -0700
Subject: [PATCH 1/3] Add support for detecting and chainloading EFI images in
 /ISOs/*

---
 config/efi-images/efi-images.cfg | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 config/efi-images/efi-images.cfg

diff --git a/config/efi-images/efi-images.cfg b/config/efi-images/efi-images.cfg
new file mode 100644
index 0000000..67a35fa
--- /dev/null
+++ b/config/efi-images/efi-images.cfg
@@ -0,0 +1,13 @@
+# Detect and chainload .efi files in /ISOs/*
+
+if [ "${grub_platform}" == "efi" ]; then
+  for efifile in $iso_dir/*.efi; do
+    if [ -e "$efifile" ]; then
+      regexp --set=efiname "$iso_dir/(.*)" "$efifile"
+
+      menuentry --class=efi "$efiname ->" "$efifile" {
+        chainloader "${2}"
+      }
+    fi
+  done
+fi

From 041698121b2f449658e9065a5f0a23a85d3d9f52 Mon Sep 17 00:00:00 2001
From: MexIT <25229673+Mexit@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:19:43 +0200
Subject: [PATCH 2/3] Delete config/efi-images/efi-images.cfg

---
 config/efi-images/efi-images.cfg | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 config/efi-images/efi-images.cfg

diff --git a/config/efi-images/efi-images.cfg b/config/efi-images/efi-images.cfg
deleted file mode 100644
index 67a35fa..0000000
--- a/config/efi-images/efi-images.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Detect and chainload .efi files in /ISOs/*
-
-if [ "${grub_platform}" == "efi" ]; then
-  for efifile in $iso_dir/*.efi; do
-    if [ -e "$efifile" ]; then
-      regexp --set=efiname "$iso_dir/(.*)" "$efifile"
-
-      menuentry --class=efi "$efiname ->" "$efifile" {
-        chainloader "${2}"
-      }
-    fi
-  done
-fi

From 16ca2242757a6767541de720663d011095a9ba07 Mon Sep 17 00:00:00 2001
From: MexIT <25229673+Mexit@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:22:57 +0200
Subject: [PATCH 3/3] Add submenu for EFI User Tools

---
 config/grub.config | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/config/grub.config b/config/grub.config
index 70130ee..26f2dde 100644
--- a/config/grub.config
+++ b/config/grub.config
@@ -197,6 +197,29 @@ if [ "${grub_platform}" == "efi" ]; then
 		fi
 	}
 
+	submenu "EFI User Tools -->" {
+		set found=0
+
+		for efifile in /MultiOS-USB/tools/*.efi; do
+			if [ -f "$efifile" ]; then
+				set found=1
+				regexp --set=efiname "/MultiOS-USB/tools/(.*)" "$efifile"
+
+				menuentry --class=efi "$efiname" "$efifile" {
+					chainloader "${2}"
+				}
+			fi
+		done
+
+		if [ "$found" = "0" ]; then
+			menuentry "(!) No .efi files found — place them in /MultiOS-USB/tools/" --class=warning {
+				echo "No EFI files found in /MultiOS-USB/tools/"
+				echo "Copy your .efi files to that folder and reboot."
+				sleep 5
+			}
+		fi
+	}
+
 	submenu "Network bootable OS installers (DHCP) -->" {
 		if net_bootp; then
 			source /MultiOS-USB/config/grub_netboot/main.cfgnet