diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-11-24 01:10:50 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-11-24 01:10:50 +0000 |
| commit | 1f9d2d8086d059045bb5e183a088c7fa741fe8c8 (patch) | |
| tree | 1719260d10a0069c35dec361ec9309b214a6ece3 /resources/grub/config/menuentries | |
| parent | f5b14519aaa269bcf6fb056e5c24e408d79a5ece (diff) | |
grub.cfg: Add more path checks to isolinux parser
Should make more ISO's work
Diffstat (limited to 'resources/grub/config/menuentries')
| -rw-r--r-- | resources/grub/config/menuentries/common.cfg | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg index 62457d5..eebfbc2 100644 --- a/resources/grub/config/menuentries/common.cfg +++ b/resources/grub/config/menuentries/common.cfg @@ -7,21 +7,31 @@ menuentry 'Load Operating System' { } menuentry 'Parse ISOLINUX menu (USB)' { set root='usb0' - syslinux_configfile -i (usb0)/isolinux/isolinux.cfg + 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 } menuentry 'Parse ISOLINUX menu (CD)' { set root='ata0' - syslinux_configfile -i (ata0)/isolinux/isolinux.cfg -} -menuentry 'Load Trisquel netinstall (USB)' { - set root='usb0' - linux /linux - initrd /initrd.gz -} -menuentry 'Load Trisquel netinstall (CD)' { - set root='ata0' - linux /linux - initrd /initrd.gz + 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 } menuentry 'Switch to grubtest.cfg' { set root='cbfsdisk' |