summaryrefslogtreecommitdiffstats
path: root/resources/grub
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-01-24 11:12:22 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-01-24 11:12:22 (EST)
commit77c68673f0fada1e4feee8ace2797f8ef1f9ff28 (patch)
tree0ffc741fa3c14669364f5c57838ed1fc79c71862 /resources/grub
parent6e8802b2713b6f3355fbfb99986d05a2a4329aca (diff)
downloadlibreboot-77c68673f0fada1e4feee8ace2797f8ef1f9ff28.zip
libreboot-77c68673f0fada1e4feee8ace2797f8ef1f9ff28.tar.gz
libreboot-77c68673f0fada1e4feee8ace2797f8ef1f9ff28.tar.bz2
grub.cfg: Fix Trisquel 7 32-bit (gnome) live USB booting
ISOLINUX parser was being given the wrong *.cfg files.
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/config/menuentries/common.cfg20
1 files changed, 6 insertions, 14 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 0d85fe1..b0a420c 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -27,16 +27,12 @@ menuentry 'Parse ISOLINUX menu (USB)' {
insmod part_gpt
for x in (usb0) (usb0,*); do
set root=$x
- if [ -f "/menu.cfg" ] ; then
+ if [ -f "/isolinux/isolinux.cfg" ] ; then
+ syslinux_configfile -i /isolinux/isolinux.cfg
+ elif [ -f "/menu.cfg" ] ; then
syslinux_configfile -i /menu.cfg
elif [ -f "/txt.cfg" ] ; then
syslinux_configfile -i /txt.cfg
- elif [ -f "/isolinux/menu.cfg" ] ; then
- syslinux_configfile -i /isolinux/menu.cfg
- elif [ -f "/isolinux/txt.cfg" ] ; then
- syslinux_configfile -i /isolinux/txt.cfg
- elif [ -f "/isolinux/isolinux.cfg" ] ; then
- syslinux_configfile -i /isolinux/isolinux.cfg
fi
done
}
@@ -46,16 +42,12 @@ menuentry 'Parse ISOLINUX menu (CD/DVD)' {
insmod iso9660
for x in (ata0) (ahci1); do
set root=$x
- if [ -f "/menu.cfg" ] ; then
+ if [ -f "/isolinux/isolinux.cfg" ] ; then
+ syslinux_configfile -i /isolinux/isolinux.cfg
+ elif [ -f "/menu.cfg" ] ; then
syslinux_configfile -i /menu.cfg
elif [ -f "/txt.cfg" ] ; then
syslinux_configfile -i /txt.cfg
- elif [ -f "/isolinux/menu.cfg" ] ; then
- syslinux_configfile -i /isolinux/menu.cfg
- elif [ -f "/isolinux/txt.cfg" ] ; then
- syslinux_configfile -i /isolinux/txt.cfg
- elif [ -f "/isolinux/isolinux.cfg" ] ; then
- syslinux_configfile -i /isolinux/isolinux.cfg
fi
done
}