X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=4fbded2f62a6679543e3dcfc5886477c12185015;hp=e6db01d0cf642a228c2b748773b68c9d71273291;hb=39edd534899386337f2dc63282157b124bda3a2d;hpb=f4df7b052074c426861a7d9fe0a51bb1105bd7c9

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index e6db01d..4fbded2 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -5,7 +5,7 @@
 label debug
   menu label %GRML_NAME% - ^Debug Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 verbose debug=vc debug initcall_debug nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 verbose debug=vc initcall nomce 
 
   text help
                                         Boot Grml in debug mode, which
@@ -16,16 +16,26 @@ label debug
 label nofb
   menu label %GRML_NAME% - Dis^able Framebuffer
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal quiet nomce 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce 
 
   text help
                                         Boot Grml without framebuffer.
   endtext
 
-label lang-de
+label nokms
+  menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
+  kernel /boot/%SHORT_NAME%/linux26
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset nomce vga=791 
+
+  text help
+                                        Boot Grml without KMS (Kernel
+                                        Mode Setting).
+  endtext
+
+label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce ssh
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce ssh
 
   text help
                                         Boot Grml and automatically start
@@ -36,23 +46,10 @@ label lang-de
                                         line (for example: ssh=secret).
   endtext
 
-label failsafe
-  menu label %GRML_NAME% - ^Failsafe Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live vga=normal 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 pci=nomsi 
-
-  text help
-                                        Boot Grml in failsafe mode, which
-                                        disables any hardware recognition
-                                        that might prevent your system from
-                                        booting. If Grml does not boot in
-                                        default mode try using this option.
-  endtext
-
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 
 
   text help
                                         Boot Grml in forensic mode. This
@@ -65,7 +62,7 @@ label forensic
 label lang-de
   menu label %GRML_NAME% - ^German Settings
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce lang=de 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce lang=de 
 
   text help
                                         Boot Grml with german settings.
@@ -74,7 +71,7 @@ label lang-de
 label %GRML_NAME%x
   menu label %GRML_NAME% - Graphical ^Mode
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off quiet nomce startx=wm-ng 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce startx
 
   text help
                                         Boot Grml and automatically invoke
@@ -84,7 +81,7 @@ label %GRML_NAME%x
 label grml2ram
   menu label %GRML_NAME% - Load to ^RAM
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=791 quiet nomce toram=%SQUASHFS_NAME% 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce toram=%SQUASHFS_NAME% 
 
   text help
                                         Load Grml into the memory (RAM).
@@ -96,14 +93,26 @@ label grml2ram
                                         to use this option.
   endtext
 
+label persistent
+  menu label %GRML_NAME% - ^Persistent mode
+  kernel /boot/%SHORT_NAME%/linux26
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 nomce persistent=nofiles 
+
+  text help
+					Boot Grml and enable persistency
+					feature to store system and
+					settings on an external device
+					with label live-rw / home-rw.
+  endtext
+
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce console=tty1 console=ttyS0,9600n8 
 
 
   text help
-                                        Activate ttyS0 and start mgetty.
+                                        Activate ttyS0 and start a getty.
   endtext
 
 # back to main menu