X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fgrub.cfg;h=039ee6dd1978c3a4f4a8b5a19b14f42343e7ccb4;hp=05d7493a9a65d79ee0d8ce3a0603f76c98d61e37;hb=c30a975436f651982a2ce768da8265e2b5204a89;hpb=b8a13e3f8afff62fe3d767264b83d4ccde4cf006

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 05d7493..039ee6d 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -4,16 +4,16 @@ 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
 fi
 
 if background_image /boot/grub/grml.png ; then
-  set color_normal=black/black
+  set color_normal=white/black
   set color_highlight=red/black
-  set menu_color_normal=black/black
+  set menu_color_normal=white/black
   set menu_color_highlight=black/yellow
 else
   set menu_color_normal=white/black
@@ -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
 }
@@ -34,8 +34,8 @@ menuentry "Memory test (memtest86+)" {
     linux16 /boot/addons/memtest
 }
 
-menuentry "GPXE - boot via network/PXE" {
-    linux16 /boot/addons/gpxe.lkrn
+menuentry "iPXE - boot via network/PXE" {
+    linux16 /boot/addons/ipxe.lkrn
 }
 
 menuentry "GRUB - all in one image" {
@@ -77,7 +77,6 @@ else
         module      /boot/addons/bsd4grml/boot.5 boot.5
         module      /boot/addons/bsd4grml/boot.6 boot.6
         module      /boot/addons/bsd4grml/boot.cfg boot.cfg
-        module      /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
         module      /boot/grub/core.img core.img
     }
 fi
@@ -88,26 +87,26 @@ 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
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
+    set gfxpayload=keep
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -118,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
 }
@@ -136,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
 }