X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fmenu.lst;h=0a71074271fdddffd61a25df601a65cae0b69eca;hb=55dde69ba032841fce15eb2cef598c05666e9488;hp=15facd97b9b328bd6cbaf732423e31d3eadcd53e;hpb=829bcb9166e4ede590b4294106376af22314b739;p=grml-live.git

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 15facd9..0a71074 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -15,8 +15,12 @@ title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
 kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
-title %GRML_NAME% %VERSION% - without framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
+title %GRML_NAME% %VERSION% - disable framebuffer
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
+initrd /boot/%SHORT_NAME%/initrd.gz
+
+title %GRML_NAME% %VERSION% - disable Kernel Mode Setting
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset vga=791 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
@@ -28,7 +32,7 @@ kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz b
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% 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 
+kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% 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
 
 title %GRML_NAME% %VERSION% - debug mode
@@ -44,11 +48,11 @@ kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bo
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce partition=/dev/ice1 mbr=/dev/ice
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd partition=/dev/ice1 mbr=/dev/ice user=grml filesystem=ext3
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% 
+kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial console mode
@@ -67,14 +71,14 @@ kernel /boot/addons/bsd4grml/ldbsd.com
 
 title MirOS bsd4grml (fallback method)
 kernel /boot/addons/bsd4grml/ldbsd.com
-modulenounzip /boot/addons/bsd4grml/bsd.rd
-module /boot/addons/bsd4grml/boot.1
-module /boot/addons/bsd4grml/boot.2
-module /boot/addons/bsd4grml/boot.3
-module /boot/addons/bsd4grml/boot.4
-module /boot/addons/bsd4grml/boot.5
-module /boot/addons/bsd4grml/boot.6
-module /boot/addons/bsd4grml/boot.cfg
-module /boot/grub/%GRUB_LEGACY%
-module /boot/grub/core.img
+modulenounzip /boot/addons/bsd4grml/bsd.rd bsd.rd
+module /boot/addons/bsd4grml/boot.1 boot.1
+module /boot/addons/bsd4grml/boot.2 boot.2
+module /boot/addons/bsd4grml/boot.3 boot.3
+module /boot/addons/bsd4grml/boot.4 boot.4
+module /boot/addons/bsd4grml/boot.5 boot.5
+module /boot/addons/bsd4grml/boot.6 boot.6
+module /boot/addons/bsd4grml/boot.cfg boot.cfg
+modulenounzip /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
+modulenounzip /boot/grub/core.img core.img