Extend the infotext about the ssh feature for bootmenu and f5-help at

boot prompt

diff --git a/templates/boot/isolinux/f5 b/templates/boot/isolinux/f5
index fec5c7d..a802d42 100644 (file)
--- a/templates/boot/isolinux/f5
+++ b/templates/boot/isolinux/f5
@@ -7,7 +7,7 @@
  grml noswraid                       disable search for software RAID devices  
  grml noudev                disable startup of udev (disables module loading)  
  grml services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]  
- grml ssh=password            set password for user grml and start ssh-server  
+ grml ssh=password     set password for user grml + root and start ssh-server
  grml startx[=windowmanager]                     autostart X.org using grml-x  
  grml swap                                   activate present swap partitions  
  grml testcd                              check CD data integrity and md5sums  

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 936fd2d..ce0819e 100644 (file)
--- 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