X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fgrub.cfg;h=39dcdca2ef226e1c186688655402a81a4470fec3;hb=8dbae90c55e3bd863e4cf64edc267ea398ecb7e6;hp=7aac3bad300df31bddeb4a40b3b467d238826eac;hpb=b9dbe4c6e7a8d9fc03fc54e8e3e15abe0a7b70e3;p=grml-live.git

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 7aac3ba..39dcdca 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=1920x1280,1920x1080,1440x900,1024x768,auto
+   set gfxmode=1920x1200,1920x1080,1600x900,1440x1050,1440x900,1024x768,auto
    insmod gfxterm
    insmod vbe
    terminal_output gfxterm
@@ -26,7 +26,7 @@ fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
     set gfxpayload=keep
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -88,49 +88,43 @@ menuentry "Boot OS of first partition on first disk" {
 
 menuentry "%GRML_NAME% - enable persistent mode" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent=nofiles 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram=%GRML_NAME%.squashfs 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" 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}" quiet video=ofonly  radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" 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 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
     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 nodmraid nolvm noresume selinux=0 edd=off 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -142,7 +136,7 @@ menuentry "%GRML_NAME% - debug mode" {
 
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }