From 184a289a357892be363bd05e40a62558108149d6 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Tue, 22 May 2012 09:59:53 +0200
Subject: revert non-working $grub_platform change
---
config/binary_grub/grub.cfg | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index edd3cf9..5af0640 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -7,12 +7,12 @@ set boot_de='boot=live config utc=no timezone=Europe/Berlin locales=de keyboard-
if loadfont /boot/grub/unicode.pf2 ; then
set gfxmode=800x600
- if [ "$grub_platform" == "efi" ]; then
- insmod efi_gop
- insmod efi_uga
- else
+ if [ $efi != 1 ] ; then
insmod vbe
insmod vga
+ else
+ insmod efi_gop
+ insmod efi_uga
fi
insmod video_bochs
insmod video_cirrus
@@ -102,7 +102,11 @@ menuentry 'Start Kanotix EN (failsafe)' {
#####
-if [ "$grub_platform" == "efi" ]; then
+if [ $efi != 1 ] ; then
+ menuentry 'Memtest86+' {
+ linux16 /live/memtest
+ }
+else
if test -f /efi/boot/shellx64.efi ; then
menuentry 'EFI Shell x64' {
chainloader /efi/boot/shellx64.efi
@@ -123,9 +127,5 @@ if [ "$grub_platform" == "efi" ]; then
}
fi
done
-else
- menuentry 'Memtest86+' {
- linux16 /live/memtest
- }
fi
--
cgit v1.0