From: Michael Prokop <mika@grml.org>
Date: Tue, 2 Feb 2010 00:04:23 +0000 (+0100)
Subject: Support NO_BOOTID.
X-Git-Tag: v0.9.35~9
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=8491a6fb374e014854f8008ccb5ac75be4e38096

Support NO_BOOTID.
---

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a954874..5e648cb 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -186,11 +186,13 @@
 # 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.
+# 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 this variable are not supported.
 # BOOTID="mybootid"
 
+# Do you want to skip the /conf/bootid.txt feature?
+# NO_BOOTID='1'
+
 ## END OF FILE #################################################################
diff --git a/grml-live b/grml-live
index e2dcb30..b86f51b 100755
--- a/grml-live
+++ b/grml-live
@@ -714,11 +714,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # make sure the squashfs filename is set accordingly:
       SQUASHFS_NAME="$GRML_NAME.squashfs"
 
-      [ -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
-      eend $?
+      if [ -n "$NO_BOOTID" ] ; then
+         log   'Skipping bootid feature as requested via $NO_BOOTID.'
+         einfo 'Skipping bootid feature as requested via $NO_BOOTID.'
+      else
+         [ -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}."
+         log   "Generating /conf/bootid.txt with entry ${BOOTID}."
+         echo "$BOOTID" > "$BUILD_OUTPUT"/conf/bootid.txt
+         eend $?
+      fi
 
       # adjust all variables in the templates with the according distribution information
       for file in "${BUILD_OUTPUT}"/boot/isolinux/*.cfg "${BUILD_OUTPUT}"/boot/isolinux/*.msg \
@@ -733,7 +739,11 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
         sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/g"    "${file}"
         sed -i "s/%SHORT_NAME%/$SHORT_NAME/g"        "${file}"
         sed -i "s/%VERSION%/$VERSION/g"              "${file}"
-        sed -i "s/%BOOTID%/$BOOTID/g"                "${file}"
+        if [ -n "$NO_BOOTID" ] ; then
+           sed -i "s/ bootid=%BOOTID%//g" "${file}" # drop bootid bootoption
+        else
+           sed -i "s/%BOOTID%/$BOOTID/g" "${file}" # adjust bootid=... bootoption
+        fi
       done
 
       # adjust bootsplash accordingly but make sure the string has the according lenght