X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2FGRML%2Fgrml-cheatcodes.txt;h=2b6c513fa318215751e1f5d479a8bb9c9e7287c9;hp=ce7a10882f57547749921706558e03bd526a8d27;hb=308d87b0f5b576962756484d50e8bd11b680bfb0;hpb=0533a725f51aa9759cf12312cff52a50756ba47e

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index ce7a108..2b6c513 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -63,7 +63,7 @@ grml file=foobar.tbz                Use specified file as name for configuration
                                     instead of the default one (config.tbz)
 grml extract=/etc                   Extract only /etc from configuration archive,
                                     use it in combination with myconfig or netconfig
-grml persistent                     Enable persistency feature, more details available at
+grml persistence                    Enable persistency feature, more details available at
                                     http://wiki.grml.org/doku.php?id=persistency
 grml hostname=...                   Set hostname to given argument
 grml hostname                       Set a random hostname
@@ -111,7 +111,7 @@ grml tohd=/dev/sda1                 Copy Grml's squashfs file to harddisk partit
                                     use via "grml bootfrom=/dev/sda1"
 grml bootfrom=/dev/sda1             Use the squashfs file from directory 'live' of the specified device
                                     Setup can be done booting 'grml tohd=/dev/sda1' or
-                                    running 'rsync -a --progress /live/image/live /media/sda1/'
+                                    running 'rsync -a --progress /lib/live/mount/medium/live /media/sda1/'
 grml bootfrom=removable             Restrict search for the live media to removable type only.
 grml bootfrom=removable-usb         Restrict search for the live media to usb mass storage only.
 grml isofrom=/dev/sda1/grml.iso     Use specified ISO image for booting
@@ -156,9 +156,16 @@ grml log                            Log error messages while booting to /tmp/grm
                                     and /var/log/boot
 grml testcd                         Check CD data integrity and md5sums
 
+Security / login related settings:
+----------------------------------
+
+grml ssh=password                   Set password for root & grml user and start ssh-server
+grml passwd=...                     Set password for root & grml user
+grml encpasswd=....                 Set specified hash as password for root & grml user, use e.g.
+                                    'mkpasswd -H md5' to generate such a hash (available in Grml >=2013.09)
+
 Service related settings:
 -------------------------
-grml ssh=password                   Set password for root & grml user and start ssh-server
 grml startup=script                 Start $script instead of grml-quickconfig on startup
 grml nosyslog                       Do not start syslog daemon
 grml nogpm                          Disable GPM daemon
@@ -190,7 +197,7 @@ grml vnc_connect=host[:port]        Connect to a listening VNC client ("vncviewe
                                     [Note: Grml 2011.12+ doesn't include a VNC client.]
 
 Accessibility related settings:
---------------------------------
+-------------------------------
 grml brltty=type,port,table         Parameters for Braille device (e.g.: brltty=al,/dev/ttyS0,text.de.tbl)
                                     See http://mielke.cc/brltty/guidelines.html for documentation.