Don't hardcode wm-ng as window manager for X

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

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index d040156..039ee6d 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -4,32 +4,28 @@ 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
   set menu_color_highlight=black/yellow
 fi
 
-# make sure we can access partitions
-insmod part_msdos
-insmod part_gpt
-
 if [ ${iso_path} ] ; then
     set loopback="findiso=${iso_path}"
 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
 }
@@ -38,18 +34,18 @@ 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" {
-    linux   /boot/addons/memdisk
-    initrd  /boot/addons/allinone.img
+menuentry "GRUB - all in one image" {
+    linux16  /boot/addons/memdisk
+    initrd16 /boot/addons/allinone.img
 }
 
 menuentry "FreeDOS" {
-    linux   /boot/addons/memdisk
-    initrd  /boot/addons/balder10.imz
+    linux16  /boot/addons/memdisk
+    initrd16 /boot/addons/balder10.imz
 }
 
 if [ ${iso_path} ] ; then
@@ -81,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
@@ -92,49 +87,55 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    set gfxpayload=1024x768x16,1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent 
+    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
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietvideo=ofonly 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=ofonly  radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
+    initrd /boot/%SHORT_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
+    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
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    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
 }
 
 menuentry "%GRML_NAME% - failsafe mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nodmraid nolvm noresume selinux=0 edd=off 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 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
 }