Skip to content

Commit

Permalink
Use ";" as separator character when adjusting DEFAULT_BOOTOPTIONS via…
Browse files Browse the repository at this point in the history
… sed

Otherwise customizations like tz=Europe/Vienna will break, as
the "/" inside it will be interpreted by sed(1).
  • Loading branch information
mika committed Feb 27, 2012
1 parent e06b6cf commit 6eb1b1e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion grml-live
Expand Up @@ -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
Expand Down

0 comments on commit 6eb1b1e

Please sign in to comment.