summaryrefslogtreecommitdiffstats
path: root/resources/grub
diff options
context:
space:
mode:
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/config/menuentries/common.cfg34
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'