Update documentation regarding bootid feature.

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 493bb2d..a954874 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -185,4 +185,12 @@
 # By default the package list is sent to stdout but grml-live doesn't interrupt.
 # EXIT_ON_MISSING_PACKAGES=1
 
 # By default the package list is sent to stdout but grml-live doesn't interrupt.
 # EXIT_ON_MISSING_PACKAGES=1
 

+# Do you want to use a special string for identifying the ISO?
+# By default the grml-name and version string are used as a base
+# for generating /conf/bootid.txt on the ISO. If you want to use
+# a different value feel free to adjust it accordingly.
+# Please notice that space characters inside the variable are
+# not supported.
+# BOOTID="mybootid"
+

 ## END OF FILE #################################################################
 ## END OF FILE #################################################################

diff --git a/grml-live b/grml-live
index f71ce70..e2dcb30 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -716,7 +716,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       [ -n "$BOOTID" ] || BOOTID="$(echo ${GRML_NAME}${VERSION} | tr -d ',./;\- ')"
       [ -d "$BUILD_OUTPUT"/conf ] || mkdir "$BUILD_OUTPUT"/conf
 
       [ -n "$BOOTID" ] || BOOTID="$(echo ${GRML_NAME}${VERSION} | tr -d ',./;\- ')"
       [ -d "$BUILD_OUTPUT"/conf ] || mkdir "$BUILD_OUTPUT"/conf

+      einfo "Generating /conf/bootid.txt with entry ${BOOTID}."

       echo "$BOOTID" > "$BUILD_OUTPUT"/conf/bootid.txt
       echo "$BOOTID" > "$BUILD_OUTPUT"/conf/bootid.txt

+      eend $?

 
       # adjust all variables in the templates with the according distribution information
       for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \
 
       # adjust all variables in the templates with the according distribution information
       for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 60e202e..6fb9d99 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -105,9 +105,9 @@ grml isofrom=/dev/sda1/grml.iso     Use specified ISO image for booting
                                     "boot=live isofrom=/dev/sda1/grml.iso"
                                     Notice: "fromiso" does the same as "isofrom", it's just there
                                     to prevent any typing errors
                                     "boot=live isofrom=/dev/sda1/grml.iso"
                                     Notice: "fromiso" does the same as "isofrom", it's just there
                                     to prevent any typing errors

-grml findiso=/grml_2009.05.iso      Look for the specified ISO file on all disks where it usually
+grml findiso=/grml_2009.10.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
                                     looks for the .squashfs file (so you don't have to know the device name

-                                    as in isofrom=....). [Available since grml 2009.05]
+                                    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 module=grml                    Instead of using the default "$name.module" another file can
 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


@@ -115,11 +115,18 @@ grml module=grml                    Instead of using the default "$name.module"
                                     on "/live" directory of the live medium
                                     Useful for Multiboot USB pen, see
                                     http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen
                                     on "/live" directory of the live medium
                                     Useful for Multiboot USB pen, see
                                     http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen

+grml bootid=mybootid                Use specified argument as identifier for the ISO.
+                                    [Note: only available in releases >2009.10]
+grml ignore_bootid                  Disable bootid verification.
+                                    [Note: only available in releases >2009.10]
+

 
 Debugging related settings:
 ---------------------------
 
 Debugging related settings:
 ---------------------------

-debug                               Get shells during process of booting, using GNU screen, most verbose
-grml debug                          Get shells during process of booting, using GNU screen, verbose
+debug                               Get shells during process of booting, using GNU screen, be very verbose
+grml debug                          Get shells during process of booting, using GNU screen, be verbose
+grml debug=1                        Get shells during process of booting, using GNU screen, be verbose and
+                                    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
 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`"