From e59f935de8d8358a351d571c2a7831b37cabdef4 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Sun, 20 May 2012 16:13:54 +0200
Subject: updated grub.cfg for combined ISOs
---
config/binary_grub/grub.cfg | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 52ae410..0a5d6df 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -42,17 +42,11 @@ if test -e ($root,msdos3) ; then
echo 'Loading initial ramdisk ...'
initrd /live/initrd.img
}
- else
- menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
- echo 'Loading Linux ...'
- linux /live/vmlinuz ${boot_en} quiet splash persistent
- echo 'Loading initial ramdisk ...'
- initrd /live/initrd.img
- }
fi
fi
fi
+#####
menuentry 'Start Kanotix DE' --class kanotix64 --class gnu-linux --class gnu --class os {
echo 'Loading Linux ...'
linux /live/vmlinuz ${boot_de} quiet splash
@@ -100,14 +94,23 @@ menuentry 'Start Kanotix EN (failsafe)' --class kanotix64 --class gnu-linux --cl
initrd /live/initrd.img
}
+#####
+
if [ $efi != 1 ] ; then
menuentry 'Memtest86+' --class memtest {
linux16 /live/memtest
}
else
- menuentry 'EFI Shell' {
- chainloader /efi/boot/shellx64.efi
- }
+ if test -f /efi/boot/shellx64.efi ; then
+ menuentry 'EFI Shell x64' {
+ chainloader /efi/boot/shellx64.efi
+ }
+ fi
+ if test -f /efi/boot/shellx86.efi ; then
+ menuentry 'EFI Shell x86' {
+ chainloader /efi/boot/shellx86.efi
+ }
+ fi
if search -nf /EFI/Microsoft/Boot/BOOTMGR.EFI ; then
menuentry 'Microsoft Bootmgr' {
search -sf /EFI/Microsoft/Boot/BOOTMGR.EFI
--
cgit v1.0