summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-09-29 10:55:03 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2011-09-29 10:55:03 +0200
commit1bdda30f49360eb55aa99cba9ff56ae16badc796 (patch)
tree3fa02f00f01712b098c8d97e317cef3c0512b196
parent71ac8e4223a5ab0afa69ac18967b7b4fc8c734bf (diff)
downloadkanotix-1bdda30f49360eb55aa99cba9ff56ae16badc796.zip
kanotix-1bdda30f49360eb55aa99cba9ff56ae16badc796.tar.gz
check for efi before trying to load gfx modules
-rw-r--r--config/binary_grub/grub.cfg10
-rw-r--r--config/binary_local-includes/boot/grub/x86_64-efi/grub.cfg2
2 files changed, 7 insertions, 5 deletions
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 7ea53d0..be60ad3 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -5,10 +5,14 @@ set boot_en='boot=live config utc=yes locales=us'
set boot_de='boot=live config utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys'
if loadfont /boot/grub/unicode.pf2 ; then
- # set gfxmode=auto
set gfxmode=800x600
- insmod vbe
- insmod vga
+ if [ $efi != 1 ] ; then
+ insmod vbe
+ insmod vga
+ else
+ insmod efi_gop
+ insmod efi_uga
+ fi
insmod video_bochs
insmod video_cirrus
insmod gfxterm
diff --git a/config/binary_local-includes/boot/grub/x86_64-efi/grub.cfg b/config/binary_local-includes/boot/grub/x86_64-efi/grub.cfg
index 107a80e..bff7cab 100644
--- a/config/binary_local-includes/boot/grub/x86_64-efi/grub.cfg
+++ b/config/binary_local-includes/boot/grub/x86_64-efi/grub.cfg
@@ -6,7 +6,5 @@ insmod part_gpt
insmod part_msdos
insmod part_sun
insmod part_sunpc
-insmod efi_gop
-insmod efi_uga
set efi=1
source /boot/grub/grub.cfg