From 9ab4f43d845b65d6b939d2cc39f4713c9bd7a3f4 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 21 Jan 2015 22:53:02 -0500
Subject: grub.cfg: In default entry, search for libreboot_grub.cfg on disk

If not found, fall back to the previous behavior.
---
(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index eebfbc2..20abd54 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -1,8 +1,14 @@
 menuentry 'Load Operating System' {
-	set root='ahci0,msdos1'
-	linux  /vmlinuz root=/dev/sda1 rw
-	if [ -f "/initrd.img" ] ; then
-		initrd /initrd.img
+	if search --file --set /boot/grub/libreboot_grub.cfg ; then
+		configfile /boot/grub/libreboot_grub.cfg
+	elif search --file --set /grub/libreboot_grub.cfg ; then
+		configfile /grub/libreboot_grub.cfg
+	else
+		set root='ahci0,msdos1'
+		linux  /vmlinuz root=/dev/sda1 rw
+		if [ -f "/initrd.img" ] ; then
+			initrd /initrd.img
+		fi
 	fi
 }
 menuentry 'Parse ISOLINUX menu (USB)' {
--
cgit v0.9.1