From dd96f9d76ec9369aeb38d8e6658d0d4d0473e141 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 11 Apr 2015 12:52:56 -0400
Subject: grub.cfg: Also scan for grub2/grub.cfg, not just grub/grub.cfg

A Fedora 21 user had issues. This should make them happy.
---
(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 7dacc69..c6b5109 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -94,6 +94,20 @@ menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS' {
 				unset superusers
 			}
 		fi
+		if [ -f "$x/grub2/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x { 
+				root=$2
+				source /grub2/grub.cfg
+				unset superusers
+			}
+		fi
+		if [ -f "$x/boot/grub2/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x {
+				root=$2
+				source /boot/grub2/grub.cfg
+				unset superusers
+			}
+		fi
 	done
 }
 
--
cgit v0.9.1