From 9ecb70ac6e6b9a2610ae536d622e2cdddfe524e8 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Thu, 22 Jan 2015 21:46:13 -0500
Subject: grub.cfg: Scan all USB partitions for ISOLINUX parser

This makes it possible to boot from USB regardless of what
what partition an ISO file was written to using dd.
---
(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 0c94947..5299da2 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -21,18 +21,20 @@ menuentry 'Load Operating System' {
 	fi
 }
 menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	if [ -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
+	for x in (usb0) (usb0,*); do
+		set root=$x
+		if [ -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
 }
 menuentry 'Parse ISOLINUX menu (CD)' {
 	set root='ata0'
--
cgit v0.9.1