summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-07-10 22:52:49 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-07-10 22:52:49 (EDT)
commit4cd66b8b15d50f811d51ce36921fbb6d30ece653 (patch)
tree01993e7206d9dda4eda9b4a1761a10c70389532e
parente1d8c6060215cbe2beccc977604301dcdb3394ca (diff)
downloadlibreboot-4cd66b8b15d50f811d51ce36921fbb6d30ece653.zip
libreboot-4cd66b8b15d50f811d51ce36921fbb6d30ece653.tar.gz
libreboot-4cd66b8b15d50f811d51ce36921fbb6d30ece653.tar.bz2
grub.cfg: switch to on-disk grub.cfg if it exists
-rw-r--r--resources/grub/config/menuentries/common.cfg8
1 files changed, 8 insertions, 0 deletions
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'