summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-01-22 21:46:13 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-01-22 21:46:13 (EST)
commit9ecb70ac6e6b9a2610ae536d622e2cdddfe524e8 (patch)
treec0c3b3aa038aea23e62b6dcbc6d8dbd18e4731c3
parent1ca22162c399831362a96235105a290cbe26c7ac (diff)
downloadlibreboot-9ecb70ac6e6b9a2610ae536d622e2cdddfe524e8.zip
libreboot-9ecb70ac6e6b9a2610ae536d622e2cdddfe524e8.tar.gz
libreboot-9ecb70ac6e6b9a2610ae536d622e2cdddfe524e8.tar.bz2
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.
-rw-r--r--resources/grub/config/menuentries/common.cfg26
1 files changed, 14 insertions, 12 deletions
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'