X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=b4161dd63fbe9457f03d8ab5a0acd97ec9caa0ef;hb=bec1e6582b34f6b44e4541618b84547a72653682;hp=7a9615f440c90f70a6ae0e97c927e0f6abf5104d;hpb=93c0695a2d628b422b50b3efe232bf48adc2b05b;p=grml-live.git

diff --git a/grml-live b/grml-live
index 7a9615f..b4161dd 100755
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Fri Feb 15 14:28:37 CET 2008 [mika]
+# Latest change: Fri Feb 15 16:08:28 CET 2008 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -222,6 +222,10 @@ shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 specify it on the command line using the -c option."
 [ -n "$OUTPUT" ] || bailout 1 "Error: \$OUTPUT unset, please set it in $LIVE_CONF or
 specify it on the command line using the -o option."
+
+# trim characters that are known to cause problems inside $GRML_NAME;
+# for example isolinux does not like '-' inside the directory name
+[ -n "$GRML_NAME" ] && export GRML_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"
 # }}}
 
 # clean/zero grml-live logfile {{{
@@ -502,6 +506,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot.msg
       sed -i "s/%DATE%/$ISO_DATE/"             "$BUILD_OUTPUT"/boot/isolinux/boot.msg
 
+      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg
+      sed -i "s/%GRML_NAME%/$GRML_NAME/"       "$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg
+
       sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg
       sed -i "s/%DATE%/$ISO_DATE/"             "$BUILD_OUTPUT"/boot/isolinux/boot-beep.msg