X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=eee0ed7c59c109ba410e63f3493c483dd162d431;hp=1177733d710295e03592fef984cd6d1df3710abf;hb=61d5ddd8de047b2448866dde4c5e9668f5d50535;hpb=9dc2a44a4f884dd4a10c0e1e638decb49127352c

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 1177733..eee0ed7 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -35,27 +35,28 @@ label nokms
 label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce ssh
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce ssh 
 
   text help
                                         Boot Grml and automatically start
                                         SSH Server. The password for user
-                                        'grml' will be set to a random
-                                        password, unless you add an option
-                                        to the ssh argument in the command
-                                        line (for example: ssh=secret).
+                                        'grml' and 'root' will be set to
+                                        a random password, unless you add
+                                        an option to the ssh argument in
+                                        the command line (for example:
+                                        ssh=secret).
   endtext
 
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off nomce vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect read-only 
 
   text help
                                         Boot Grml in forensic mode. This
                                         mode prevents touching any harddisks
                                         during hardware recognition and
-                                        forces all blockdevices to readonly
+                                        forces all blockdevices to read-only
                                         mode.
   endtext
 
@@ -71,7 +72,7 @@ label lang-de
 label %GRML_NAME%x
   menu label %GRML_NAME% - Graphical ^Mode
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce startx
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce startx 
 
   text help
                                         Boot Grml and automatically invoke
@@ -93,16 +94,18 @@ label grml2ram
                                         to use this option.
   endtext
 
-label persistent
-  menu label %GRML_NAME% - ^Persistent mode
+label persistence
+  menu label %GRML_NAME% - ^Persistency mode
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce persistent 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=791 nomce persistence 
 
   text help
                                         Boot Grml and enable persistency
                                         feature to store system and
                                         settings on an external device
-                                        with label live-rw / home-rw.
+                                        with label persistence or
+                                        (deprecated) full-ov, custom-ov,
+                                        live-rw or home-rw.
   endtext
 
 label serial