X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fgrml.cfg;h=2d46accdff72654dab6baf3976df079cee5a74b6;hp=936fd2db51fdedc3cfaa931829b142ac90c2231a;hb=2897f72984ecc2d44be42d6a5a76973131a4eeed;hpb=f1d811084da5ed53cd5a3c2c22457d0d605effe2

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 936fd2d..2d46acc 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -40,10 +40,11 @@ label 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
@@ -93,16 +94,17 @@ 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 full-ov, custom-ov or
+                                        (deprecated) live-rw / home-rw.
   endtext
 
 label serial