X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=edd25110aaf82852ba7a830ad22ec6376f052aee;hp=4ca3f15bad7aaeb7cf64120656178d3c7da72f2d;hb=fb91169630f056fcc70d27b05247e7f12bdd1be0;hpb=0c1ca8beff577b5ec5287db7703439eceebf380d

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 4ca3f15..edd2511 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -3,9 +3,9 @@
 # generic ones
 
 label debug
-  menu label %GRML_NAME% - Debug Mode
+  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
@@ -14,18 +14,18 @@ label debug
   endtext
 
 label nofb
-  menu label %GRML_NAME% - Disable Framebuffer
+  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 quiet nomce 
 
   text help
                                         Boot Grml without framebuffer.
   endtext
 
-label lang-de
-  menu label %GRML_NAME% - Enable SSH (with random password)
+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 quiet nomce ssh
 
   text help
                                         Boot Grml and automatically start
@@ -39,8 +39,7 @@ label lang-de
 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 
-
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 
   text help
                                         Boot Grml in failsafe mode, which
                                         disables any hardware recognition
@@ -52,7 +51,7 @@ label failsafe
 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 nolvm noautoconfig noswap raid=noautodetect readonly quiet 
 
   text help
                                         Boot Grml in forensic mode. This
@@ -63,18 +62,18 @@ label forensic
   endtext
 
 label lang-de
-  menu label %GRML_NAME% - German Settings
+  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 quiet nomce lang=de 
 
   text help
                                         Boot Grml with german settings.
   endtext
 
 label %GRML_NAME%x
-  menu label %GRML_NAME% - Graphical Mode
+  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 quiet nomce startx=wm-ng 
 
   text help
                                         Boot Grml and automatically invoke
@@ -84,7 +83,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 quiet nomce toram=%SQUASHFS_NAME% 
 
   text help
                                         Load Grml into the memory (RAM).
@@ -96,14 +95,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 quiet nomce persistent 
+
+  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
+  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 console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
 
 
   text help
-                                        Activate ttyS0 and start mgetty.
+                                        Activate ttyS0 and start a getty.
   endtext
 
 # back to main menu