From 169645b478343b5c588ba18014433e4420e12205 Mon Sep 17 00:00:00 2001
From: Ryan Finnie <ryan@finnie.org>
Date: Sat, 25 Jul 2020 22:35:28 -0700
Subject: grub-efi: Show fwsetup, do not show incompatible memtest even if
 enabled

---
 share/bootloaders/grub-pc/grub.cfg | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'share')

diff --git a/share/bootloaders/grub-pc/grub.cfg b/share/bootloaders/grub-pc/grub.cfg
index 36b6f61fb..8f54562cc 100644
--- a/share/bootloaders/grub-pc/grub.cfg
+++ b/share/bootloaders/grub-pc/grub.cfg
@@ -31,13 +31,20 @@ submenu 'Advanced install options ...' --hotkey=a {
 }
 fi
 
-if @ENABLE_MEMTEST@; then
 submenu 'Utilities...' --hotkey=u {
 
 	source /boot/grub/theme.cfg
 
 	# Memtest (if any)
-	source	/boot/grub/memtest.cfg
+	if [ "${grub_platform}" = "pc" ] && @ENABLE_MEMTEST@; then
+		source /boot/grub/memtest.cfg
+	fi
+
+	# Firmware setup (UEFI)
+	if [ "${grub_platform}" = "efi" ]; then
+		menuentry "UEFI Firmware Settings" {
+			fwsetup
+		}
+	fi
 
 }
-fi
-- 
cgit v1.2.3