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 edcd6a7..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.
 * 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:
 For example the X window system is not part of grml-small.
 
 Regional settings:


@@ -65,8 +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
                                     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
 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
 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