Update grub configuration.

[grml-live.git] / templates / boot / grub / grub.cfg

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 2f3dc4c..fde7a39 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -1,25 +1,28 @@
 ## grub2 configuration
 set default=0
-set timeout=5
+set timeout=20
 
-if font (hd0,1)/boot/grub/ascii.pff ; then
+if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
    set gfxmode=640x480
    insmod gfxterm
    insmod vbe
-   terminal gfxterm
+   terminal_output gfxterm
 fi
 
-if background_image (hd0,1)/boot/grub/grml.png ; then
+if background_image /boot/grub/grml.png ; then
   set color_normal=black/black
   set color_highlight=red/black
+  set menu_color_normal=black/black
+  set menu_color_highlight=black/yellow
 else
   set menu_color_normal=white/black
   set menu_color_highlight=black/yellow
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
+    set gfxpayload=1024x768
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -64,22 +67,26 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet persistent 
+    set gfxpayload=1024x768x16,1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet persistent 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
-menuentry "%GRML_NAME% - copy grml to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
+menuentry "%GRML_NAME% - copy Grml to RAM" {
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet toram
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet startx=wm-ng 
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -89,7 +96,8 @@ menuentry "%GRML_NAME% - disable framebuffer" {
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -99,7 +107,8 @@ menuentry "%GRML_NAME% - failsafe mode" {
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 initcall verbose debug=vc
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce initcall verbose debug=vc
     initrd /boot/%SHORT_NAME%/initrd.gz
 }