X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2FGRML%2Fgrml-cheatcodes.txt;h=066fee24b6e0f91afc73812e82544c748d4b9770;hp=c04753a3239d6fb96cb03cf7f50a56983df023ea;hb=061fdcdcf6d59e728b2e96f6a6629af74161fe3f;hpb=96dd50bc39ed1093afa12ed48b327f9773243b12

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index c04753a..066fee2 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -1,10 +1,11 @@
       CHEATCODES AND HINTS FOR GRML
 ==============================================================================
 
-These options work from the (isolinux/grub) bootprompt of Grml based (live) systems.
+Isolinux bootprompt options:
+----------------------------
 
-The following kernel options are available (do NOT use them as 'grml $OPTION',
-use them as '$OPTION'!):
+These options work from the isolinux bootprompt of Grml based (live) systems.
+(Do NOT use them as 'grml $OPTION', use them as '$OPTION'!):
 
 grml                                Use default settings (same as just pressing return)
 grml2ram                            Copy Grml's squashfs file to RAM and
@@ -22,7 +23,6 @@ forensic                            Do not touch any harddisks during hardware r
 serial                              Activate ttyS0 and start a getty
 grub                                Boot Grub bootloader (special all-in-one-image)
 dos                                 Boot FreeDOS
-bsd                                 Boot MirOS BSD
 hdt                                 Boot Hardware Detection Tool (from syslinux project)
 
 Further documentation regarding the boot process can be found at:
@@ -129,10 +129,6 @@ grml live-media-path=/live/grml...  Sets the path to the live filesystem on the
                                     By default, it is set to /live/$GRML_FLAVOUR/ (where $GRML_FLAVOUR
                                     is corresponding to grml64-full, grml32-full, grml64-small,...
                                     [Note: this option is mandatory since release 2011.12]
-grml nostats                        Don't send any information to the Grml project at startup.
-                                    Parameters sent are Grml version, if the cpu supports 64bit,
-                                    anonymized boot parameters and boot source (remote or local).
-                                    [Note: only available since release 2011.12]
 grml module=grml                    Instead of using the default "$name.module" another file can
                                     be specified without the extension ".module"; it should be placed
                                     on "/live" directory of the live medium
@@ -152,6 +148,7 @@ grml debug=1                        Get shells during process of booting, using
                                     display shell code being executed in initramfs.
 grml debug=noscreen                 Get shells during process of booting, verbose, but without using GNU screen
 grml nocolor                        Disable colorized output while booting
+                                    Also set SYSTEMD_COLORS=0 to disable colors in systemd output
 grml log                            Log error messages while booting to /tmp/grml.log.`date +%Y%m%d`"
                                     and /var/log/boot
 grml testcd                         Check CD data integrity and md5sums
@@ -243,6 +240,8 @@ grml vga=ask                        Display menu for framebuffer mode
 grml radeon.modeset=0  nomodeset    Disable Kernel Mode Setting (KMS) for Radeon driver.
 grml i915.modeset=0    nomodeset    Disable Kernel Mode Setting (KMS) for Intel driver.
 grml nouveau.modeset=0 nomodeset    Disable Kernel Mode Setting (KMS) for Nouveau driver.
+grml cirrus.modeset=0  nomodeset    Disable Kernel Mode Setting (KMS) for Cirrus driver.
+grml mgag200.modeset=0 nomodeset    Disable Kernel Mode Setting (KMS) for MGAG200 driver.
 
 Installation related settings:
 ------------------------------
@@ -306,7 +305,7 @@ as option to mkisofs. Otherwise your CD won't be bootable. The
 directory live, containing the squashfs compressed filesystem file,
 must be located in the top level directory of the CD.
 
-*) Caution: screensavers: Don't start vlock or any other screensaver
+*) Caution: screensavers: Don't start physlock or any other screensaver
 that requires a password manually. There are no default passwords on
 the live system - all accounts are LOCKED by default for security reasons.
 Instead just invoke the script grml-lock which prompts for setting a