Add hwspeak to grml-cheatcodes (and some minor formating cleanup)

diff --git a/debian/changelog b/debian/changelog
index 05febbb..990dbde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,11 @@ grml-live (0.9.17) unstable; urgency=low
     Debian and uninstallable).
   * Drop package nemesis from GRML_FULL (unmaintained upstream and
     uninstallable in Debian, see #423201).
     Debian and uninstallable).
   * Drop package nemesis from GRML_FULL (unmaintained upstream and
     uninstallable in Debian, see #423201).

-  * Mention speakup.synth=... in grml-cheatcodes.txt.
+  * Mention speakup.synth=... and hwspeak in grml-cheatcodes.txt.
+  * 15-initsetup: warn if /etc/runlevel.conf (and therefore live-rc)
+    does not exist and skip rest of the script then.

 
 

- -- Michael Prokop <mika@grml.org>  Fri, 22 May 2009 12:24:56 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 26 May 2009 10:41:03 +0200

 
 grml-live (0.9.16) unstable; urgency=low
 
 
 grml-live (0.9.16) unstable; urgency=low
 

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 0bb1ef9..2a5bd20 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -65,10 +65,10 @@ grml distri=...                     Set distribution name to given argument. If
                                    (/cdrom/desktop/"$DISTRI") it will be taken as wallpaper for grml
 grml debnet                         Search through local partitions for file /etc/network/interfaces,
                                     copy /etc/network to local system and restart networking then
                                    (/cdrom/desktop/"$DISTRI") it will be taken as wallpaper for grml
 grml debnet                         Search through local partitions for file /etc/network/interfaces,
                                     copy /etc/network to local system and restart networking then

-grml mypath=...                     Add specified option into $PATH of Zsh.
+grml mypath=...                     Add specified option into $PATH of Zsh

                                     For example when using "grml mypath=/foobar" then /foobar
                                     For example when using "grml mypath=/foobar" then /foobar

-                                    will be added to the end of $PATH inside Zsh.
-grml noautoconfig                   Disable searching for device labeled GRMLCFG.
+                                    will be added to the end of $PATH inside Zsh
+grml noautoconfig                   Disable searching for device labeled GRMLCFG

 
 Notice: Take a look at http://grml.org/config/ and /usr/share/doc/grml-saveconfig/grml-config.html
 for more information regarding the configuration framework of grml.
 
 Notice: Take a look at http://grml.org/config/ and /usr/share/doc/grml-saveconfig/grml-config.html
 for more information regarding the configuration framework of grml.


@@ -80,27 +80,27 @@ grml toram                          Copy the whole CD/medium to RAM and run from
 grml toram=filename.squashfs        Copy the specified file to RAM and run from there
                                     Usage example: grml toram=grml-medium.squashfs
                                     Notice: grml2ram is an alias for this option which
 grml toram=filename.squashfs        Copy the specified file to RAM and run from there
                                     Usage example: grml toram=grml-medium.squashfs
                                     Notice: grml2ram is an alias for this option which

-                                    corresponds with the grml flavour settings by default.
+                                    corresponds with the grml flavour settings by default

 
 grml tohd=/dev/sda1                 Copy grml's squashfs file to harddisk partition for later
                                     use via "grml bootfrom=/dev/sda1"
 
 grml tohd=/dev/sda1                 Copy grml's squashfs file to harddisk partition for later
                                     use via "grml bootfrom=/dev/sda1"

-grml bootfrom=/dev/sda1             Use the squashfs file from directory 'live' of the specified device.
+grml bootfrom=/dev/sda1             Use the squashfs file from directory 'live' of the specified device

                                     Setup can be done booting 'grml tohd=/dev/sda1' or
                                     Setup can be done booting 'grml tohd=/dev/sda1' or

-                                    running 'rsync -a --progress /live/image/live /mnt/sda1/'.
-grml isofrom=/dev/sda1/grml.iso     Use specified ISO image for booting.
+                                    running 'rsync -a --progress /live/image/live /mnt/sda1/'
+grml isofrom=/dev/sda1/grml.iso     Use specified ISO image for booting

                                     Useful when booting as a rescue system from harddisk - just boot
                                     the according grml kernel and initrd using the bootoptions
                                     Useful when booting as a rescue system from harddisk - just boot
                                     the according grml kernel and initrd using the bootoptions

-                                    "boot=live isofrom=/dev/sda1/grml.iso".
+                                    "boot=live isofrom=/dev/sda1/grml.iso"

                                     Notice: "fromiso" does the same as "isofrom", it's just there
                                     Notice: "fromiso" does the same as "isofrom", it's just there

-                                    to prevent any typing errors.
+                                    to prevent any typing errors

 grml findiso=/grml_2009.05.iso      Look for the specified ISO file on all disks where it usually
                                     looks for the .squashfs file (so you don't have to know the device name
                                     as in isofrom=....). [Available since grml 2009.05]
 grml findiso=/grml_2009.05.iso      Look for the specified ISO file on all disks where it usually
                                     looks for the .squashfs file (so you don't have to know the device name
                                     as in isofrom=....). [Available since grml 2009.05]

-grml live-media-path=live           Sets the path to the live filesystem on the medium.
-                                    By default, it is set to /live.
+grml live-media-path=live           Sets the path to the live filesystem on the medium
+                                    By default, it is set to /live

 grml module=grml                    Instead of using the default "$name.module" another file can
                                     be specified without the extension ".module"; it should be placed
 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.
+                                    on "/live" directory of the live medium

                                     Useful for Multiboot USB pen, see
                                     http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen
 
                                     Useful for Multiboot USB pen, see
                                     http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen
 


@@ -111,7 +111,7 @@ grml debug                          Get shells during process of booting, using
 grml debug=noscreen                 Get shells during process of booting, verbose, but without using GNU screen
 grml nocolor                        Disable colorized output while booting
 grml log                            Log error messages while booting to /tmp/grml.log.`date +%Y%m%d`"
 grml debug=noscreen                 Get shells during process of booting, verbose, but without using GNU screen
 grml nocolor                        Disable colorized output while booting
 grml log                            Log error messages while booting to /tmp/grml.log.`date +%Y%m%d`"

-                                    and /var/log/boot.
+                                    and /var/log/boot

 grml testcd                         Check CD data integrity and md5sums
 
 Service related settings:
 grml testcd                         Check CD data integrity and md5sums
 
 Service related settings:


@@ -140,11 +140,12 @@ grml startx{=windowmanager}         Start X window system automatically
 Accessibility related settings:
 -------------------------------
 grml blind                          Start Braille-Terminal (no X)
 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                        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.
+grml swspeak=espeak                 Use espeakup (if available) as connector to speakup

                                     Run 'swspeak' after booting up to activate sound output
                                     Run 'swspeak' after booting up to activate sound output

-grml swspeak=speechd                Use speech-dispatcher / speechd-up (if available) as connector to speakup.
+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
                                     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