summaryrefslogtreecommitdiffstats
path: root/resources/grub
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-08-18 17:31:32 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-08-18 17:31:32 (EDT)
commit0925e7d1acad14f876be5717414fd0663be6305f (patch)
treef86229cd6e4cc0519b9e8a9ccb9efd52c66ba07c /resources/grub
parentd2907e83962109fb47dcb225fdc4a85cabf80bfb (diff)
downloadlibreboot-0925e7d1acad14f876be5717414fd0663be6305f.zip
libreboot-0925e7d1acad14f876be5717414fd0663be6305f.tar.gz
libreboot-0925e7d1acad14f876be5717414fd0663be6305f.tar.bz2
grub.cfg: Don't load on-disk grub.cfg, just libreboot_grub.cfg
This maintains behavioural compatibility with release 20150518.
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/config/menuentries/common.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index e019d04..3e66425 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -3,7 +3,7 @@ menuentry 'Load Operating System' {
insmod part_msdos
insmod part_gpt
for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do
- for path in "/grub/libreboot_grub.cfg" "/boot/grub/libreboot_grub.cfg" "/grub/grub.cfg" "/boot/grub/grub.cfg"; do
+ for path in "/grub/libreboot_grub.cfg" "/boot/grub/libreboot_grub.cfg"; do
if [ -f "${x}${path}" ] ; then
set root=${x}
configfile ${path}