From: Michael Prokop <mika@grml.org>
Date: Mon, 27 Feb 2012 09:53:02 +0000 (+0100)
Subject: Use ";" as separator character when adjusting DEFAULT_BOOTOPTIONS via sed
X-Git-Tag: v0.19.0~17
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=6eb1b1e874476af08d8dc8deb21e3f522e6973d5

Use ";" as separator character when adjusting DEFAULT_BOOTOPTIONS via sed

Otherwise customizations like tz=Europe/Vienna will break, as
the "/" inside it will be interpreted by sed(1).
---

diff --git a/grml-live b/grml-live
index efd7f7c..3a2301f 100755
--- a/grml-live
+++ b/grml-live
@@ -956,7 +956,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
            sed -i "s/%SHORT_NAME%/$SHORT_NAME/g"        "${file}"
            sed -i "s/%VERSION%/$VERSION/g"              "${file}"
 
-           [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s/ boot=live/ boot=live $DEFAULT_BOOTOPTIONS/"  "${file}"
+           [ -n "$DEFAULT_BOOTOPTIONS" ] && sed -i "s; boot=live; boot=live $DEFAULT_BOOTOPTIONS;"  "${file}"
 
            if [ -n "$NO_BOOTID" ] ; then
               sed -i "s/ bootid=%BOOTID%//g" "${file}" # drop bootid bootoption