From bec1e6582b34f6b44e4541618b84547a72653682 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 15 Feb 2008 16:09:04 +0100 Subject: [PATCH] Make sure $GRML_NAME does not contain known problematic characters --- debian/changelog | 3 ++- docs/grml-live.txt | 4 ++-- grml-live | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46433e0..988f149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,9 @@ grml-live (0.4) unstable; urgency=low support of several grml flavours on one single usb pen for the future - adjust grub's menu.lst and isolinux.cfg as well as grml-live itself for new directory layout + * Make sure $GRML_NAME does not contain known problematic characters. - -- Michael Prokop Fri, 15 Feb 2008 14:28:45 +0100 + -- Michael Prokop Fri, 15 Feb 2008 16:08:38 +0100 grml-live (0.3) unstable; urgency=low diff --git a/docs/grml-live.txt b/docs/grml-live.txt index dc3d12f..5a41174 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -104,8 +104,8 @@ Force execution and do not prompt for acknowledgment of configuration. -g **GRML_NAME**:: Set the grml flavour name. Common usage examples: grml, grml-small, grml64. -Please do NOT use blanks inside GRML_NAME, otherwise you might notice problems -with booting. +Please do NOT use blanks and any characters like '-', '/', ';' inside GRML_NAME, +otherwise you might notice problems with booting. -h:: diff --git a/grml-live b/grml-live index fc18116..b4161dd 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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 {{{ -- 2.1.4