From 77c68673f0fada1e4feee8ace2797f8ef1f9ff28 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 24 Jan 2015 11:12:22 -0500
Subject: grub.cfg: Fix Trisquel 7 32-bit (gnome) live USB booting

ISOLINUX parser was being given the wrong *.cfg files.
---
(limited to 'resources')

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
 }
--
cgit v0.9.1