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

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 039ee6d..bb814b9 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=auto
    insmod gfxterm
    insmod vbe
    terminal_output gfxterm
@@ -26,8 +26,8 @@ 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 
-    initrd  /boot/%SHORT_NAME%/initrd.gz
+    linux   /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
+    initrd  /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "Memory test (memtest86+)" {
@@ -88,62 +88,56 @@ 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 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
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux  /boot/%SHORT_NAME%/vmlinuz 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.img
 }
 
 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
+    linux  /boot/%SHORT_NAME%/vmlinuz 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.img
 }
 
 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 menuentry "%GRML_NAME% - debug mode" {
     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
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 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 
-    initrd /boot/%SHORT_NAME%/initrd.gz
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    initrd /boot/%SHORT_NAME%/initrd.img
 }
 
 # EOF