Remove noapm from boot options

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

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 5df471e..7888157 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -79,6 +79,10 @@ grml distri=...                     Set distribution name to given argument. If
 grml debnet                         Search through local partitions for file /etc/network/interfaces,
                                     copy /etc/network to local system and restart networking then
 grml dns=8.8.8.8,8.8.4.4            Set DNS resolvers during boot and for live system.
+grml ip=...                         Standard Linux kernel ip= boot option. Arguments:
+                                    clientip:nfsserverip:gwip:netmask:hostname:device:autoconf
+                                    Valid values for autoconf: off, on, dhcp, bootp, rarp, both.
+                                    Almost everything is optional. Most common form: ip=dhcp
 grml mypath=...                     Add specified option into $PATH of Zsh
                                     For example when using "grml mypath=/foobar" then /foobar
                                     will be added to the end of $PATH inside Zsh
@@ -176,20 +180,6 @@ grml nostartx                       If using startx as default bootoption the no
                                     which decide to enable startx by default only, plain grml does not use
                                     automatic startup of X by default.)
 
-Accessibility related settings:
--------------------------------
-grml blind                          Start Braille-Terminal (no X)
-grml hwspeak                        Probe all available speakup hardware modules
-grml swspeak                        Prepare system for use with software synthesizer through speakup
-                                    Run 'swspeak' after booting up to activate sound output
-grml swspeak=espeak                 Use espeakup (if available) as connector to speakup
-                                    Run 'swspeak' after booting up to activate sound output
-grml swspeak=speechd                Use speech-dispatcher / speechd-up (if available) as connector to speakup
-                                    Run 'swspeak' after booting up to activate sound output
-grml brltty=type,port,table         Parameters for Braille device (e.g.: brltty=al,/dev/ttyS0,text.de.tbl)
-grml speakup.synth=...              Use speakup kernel module with given hardware type
-                                    Usage example: speakup.synth=apollo
-
 Hardware related settings:
 --------------------------
 grml swap                           Activate present/detected swap partitions
@@ -205,7 +195,7 @@ grml ethdevice=...                  Use specified network device for network boo
 grml xmodule=ati|fbdev|i810|mga     Use specified X.org-Module (1)
 grml xmodule=nv|radeon|savage|s3    Use specified X.org-Module (2)
 grml xmodule=radeon|svga|i810       Use specified X.org-Module (3)
-grml no{acpi,agp,apm,cpu,dhcp}      Skip parts of HW-detection (1)
+grml no{acpi,agp,cpu,dhcp}          Skip parts of HW-detection (1)
 grml no{dma,fstab,modem}            Skip parts of HW-detection (2)
 grml no{pcmcia,scsi,swap,usb}       Skip parts of HW-detection (3)
 grml 915resolution=...              Start resolution modify tool for Intel graphic chipset
@@ -239,7 +229,7 @@ grml nouveau.modeset=0 nomodeset    Disable Kernel Mode Setting (KMS) for Nouvea
 Installation related settings:
 ------------------------------
 
-Caution: do *NOT* use the grml2hd and/or debian2hd bootoption if you do not know what you are doing!
+Caution: do *NOT* use the debian2hd bootoption if you do not know what you are doing!
 
 Install plain Debian via debian2hd bootoption (which runs grml-debootstrap in non-interactive mode):
 
@@ -257,22 +247,6 @@ debian2hd <options>                 ... whereas valid options for debian2hd are:
 
   See http://grml.org/grml-debootstrap/ for more information.
 
-Install grml via grml2hd bootoption (which runs grml2hd in non-interactive mode):
-
-grml2hd <options>                   ... whereas valid options for grml2hd are:
-
-   user=                user name for user which should be used at hd-install
-   filesystem={ext2|ext3|reiserfs|reiser4|jfs|xfs}      filesystem to be used
-   mbr=/dev/...  partition where MBR should be installed (default:=partition)
-   partition=/dev/...                partition where grml should be installed
-
-  Usage example for booting:
-   grml2hd partition=/dev/sda4 mbr=/dev/sda filesystem=ext3 user=mika
-
-  Passwords of user root and user are "grml" - please adjust after hd-install!
-
-  See http://grml.org/grml2hd/ for more information.
-
 Additional notes:
 -----------------
 
@@ -289,7 +263,7 @@ error if you have DMA enabled. Also, please read the grml-FAQ.
 
 *) In case of a failing hardware autodetection, try booting with any of
 the "no-" options as shown in the table above, like in
-   grml noagp noapm noapic acpi=off nodma
+   grml noagp noapic acpi=off nodma
 to skip some critical parts of the autodetection system.
 
 *) Some boards (especially those with E-ISA slots) apparently don't pass