From 0925e7d1acad14f876be5717414fd0663be6305f Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Tue, 18 Aug 2015 17:31:32 -0400 Subject: grub.cfg: Don't load on-disk grub.cfg, just libreboot_grub.cfg This maintains behavioural compatibility with release 20150518. --- (limited to 'resources/grub') 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} -- cgit v0.9.1