From b9dbe4c6e7a8d9fc03fc54e8e3e15abe0a7b70e3 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Thu, 8 Dec 2011 01:12:38 +0100
Subject: [PATCH] Try to use a good gfx resolution by default

---
 templates/boot/grub/grub.cfg | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 6322d6c..7aac3ba 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -4,7 +4,7 @@ set timeout=20
 
 if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
-   set gfxmode=640x480
+   set gfxmode=1920x1280,1920x1080,1440x900,1024x768,auto
    insmod gfxterm
    insmod vbe
    terminal_output gfxterm
@@ -25,7 +25,7 @@ if [ ${iso_path} ] ; then
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
@@ -87,25 +87,25 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    set gfxpayload=1024x768x16,1024x768
+    set gfxpayload=keep
     linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent=nofiles 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy Grml to RAM" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
@@ -117,13 +117,13 @@ menuentry "%GRML_NAME% - disable framebuffer" {
 }
 
 menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
@@ -135,7 +135,7 @@ menuentry "%GRML_NAME% - failsafe mode" {
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    set gfxpayload=1024x768
+    set gfxpayload=keep
     linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
-- 
2.1.4