From 4cd66b8b15d50f811d51ce36921fbb6d30ece653 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Fri, 10 Jul 2015 22:52:49 -0400
Subject: grub.cfg: switch to on-disk grub.cfg if it exists

---
(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 3ac2bf4..e563371 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -11,6 +11,14 @@ menuentry 'Load Operating System' {
 			set root=$x
 			configfile /boot/grub/libreboot_grub.cfg
 		fi
+		if [ -f "$x/grub/grub.cfg" ] ; then
+			set root=$x
+			configfile /grub/grub.cfg
+		fi
+		if [ -f "$x/boot/grub/grub.cfg" ] ; then
+			set root=$x
+			configfile /boot/grub/grub.cfg
+		fi
 	done
 
 	set root='ahci0,1'
--
cgit v0.9.1