summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-07-05 00:54:00 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:36 +0100
commitc184c0a74fb22852985ff32da31fdf3a331c15dd (patch)
tree5490ddc8bfd682a48bd338473922140caacc7815
parentbb528d9f195becdb3b7739171e99db9cfbebe916 (diff)
downloadlive-build-c184c0a74fb22852985ff32da31fdf3a331c15dd.zip
live-build-c184c0a74fb22852985ff32da31fdf3a331c15dd.tar.gz
Perform in LH_BOOTAPPEND_INSTALL conditional expansion manually to avoid expansion bug/feature on repetitive calls to lh_config (Closes: #488672)
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 591eb07..4bf3f74 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -506,7 +506,10 @@ Set_defaults ()
# Setting boot parameters
# LH_BOOTAPPEND_LIVE
- LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL:--- \${LH_BOOTAPPEND_LIVE}}"
+ if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
+ then
+ LH_BOOTAPPEND_INSTALL="-- \${LH_BOOTAPPEND_LIVE}"
+ fi
# Setting bootloader
if [ -z "${LH_BOOTLOADER}" ]