Merge branch 'master' of ssh://git.grml.org/grml-live

[grml-live.git] / templates / GRML / grml-cheatcodes.txt

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 1437603..a166606 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -33,7 +33,7 @@ Further documentation regarding the init process can be found at:
 * http://git.debian.org/?p=kernel/initramfs-tools.git;a=blob_plain;f=initramfs-tools.8;hb=HEAD
 
 The following boot options can be combined.
-Notice: not all of the them are available on all the Grml flavours.
+Notice: not all of them are available on all the Grml flavours.
 For example the X window system is not part of grml-small.
 
 Regional settings:
@@ -41,8 +41,10 @@ Regional settings:
 grml lang=at|de|cn|da|es|fr|it      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
 grml lang=nl|pl|ru|sk|tr|tw|us      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
 grml lang=$LANG-iso                 Activate $LANG (use like in lines above) with iso-mode instead of utf8
-grml gmt                            Use GMT-based time
-grml tz=Europe/Vienna               Use this timezone for TZ
+grml gmt                            Use GMT-based time (UTC=yes)
+grml utc                            Use Coordinated Universal Time (UTC=yes)
+grml localtime                      Use local time (UTC=no)
+grml tz=Europe/Vienna               Use specified timezone for TZ
 grml keyboard=us xkeyboard=us       Use different keyboard layout (text-console/X)
 grml setkeycodes                    Set some special function keys for MS/HP keyboards
 
@@ -63,7 +65,9 @@ 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
                                     http://wiki.grml.org/doku.php?id=persistency
-grml hostname=...                   Set hostname
+grml hostname=...                   Set hostname to given argument
+grml hostname                       Set a random hostname
+                                    [Note: only available with releases newer than 2010.04]
 grml nodhcphostname                 Do not to set the hostname according to the dns information
 grml distri=...                     Set distribution name to given argument. If a jpg file named like the
                                     given distri name can be found in directory desktop on the ISO
@@ -120,6 +124,7 @@ grml module=grml                    Instead of using the default "$name.module"
                                     Useful for Multiboot USB pen, see
                                     http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen
 grml bootid=mybootid                Use specified argument as identifier for the ISO.
+                                    mybootid is specified in /conf/bootid.txt on the ISO.
                                     [Note: only available since release 2010.04]
 grml ignore_bootid                  Disable bootid verification.
                                     [Note: only available since release 2010.04]