X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2FGRML%2Fgrml-cheatcodes.txt;h=72f7fda99cd67788f68bb4bf773fb0cf7b089d23;hp=12fafdd2cf7ef7c2048e113c779cc848176b6154;hb=65ee43cd4a0ec3bba16919c503c70f79bf9ce07a;hpb=438804cfdd3a4c29dd9e9ffd9cedeb35f15bc6c6

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 12fafdd..72f7fda 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
@@ -26,9 +27,9 @@ hdt                                 Boot Hardware Detection Tool (from syslinux
 
 Further documentation regarding the boot process can be found at:
 * http://git.grml.org/?p=live-initramfs-grml.git;a=blob_plain;f=manpages/live-initramfs.en.7.txt;hb=HEAD
-* http://git.grml.org/?p=live-boot-grml.git;a=blob;f=manpages/en/live-boot.7;hb=HEAD
-* http://git.debian.org/?p=kernel/initramfs-tools.git;a=blob_plain;f=initramfs-tools.8;hb=HEAD
-* http://www.kernel.org/doc/Documentation/kernel-parameters.txt
+* https://manpages.debian.org/live-boot-doc/live-boot.7.en.html
+* https://manpages.debian.org/initramfs-tools-core/initramfs-tools.8.en.html
+* https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html
 
 The following boot options can be combined.
 Notice: not all of them are available on all the Grml flavours.
@@ -39,10 +40,9 @@ 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 (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 utc                            Hardware Clock is set to Coordinated Universal Time (UTC)
+grml localtime                      Hardware Clock is set to local time (LOCAL), this is the default
+grml tz=Europe/Vienna               Use specified timezone for TZ, defaults to TZ=UTC
 grml keyboard=us xkeyboard=us       Use different keyboard layout (text-console/X)
 
 Configuration settings:
@@ -128,10 +128,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
@@ -151,6 +147,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,7 @@ grml radeon.modeset=0  nomodeset    Disable Kernel Mode Setting (KMS) for Radeon
 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 +304,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