summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-07-05 00:54:00 +0100
committerChris Lamb <chris@chris-lamb.co.uk>2008-07-05 00:54:00 +0100
commitd3f15a317f6f6711f24ec057c6193bd6589222f0 (patch)
tree5490ddc8bfd682a48bd338473922140caacc7815 /functions
parent3205bb940915e76e6c6d594334814fd2ce2f3345 (diff)
downloadvyos-live-build-d3f15a317f6f6711f24ec057c6193bd6589222f0.tar.gz
vyos-live-build-d3f15a317f6f6711f24ec057c6193bd6589222f0.zip
Perform in LH_BOOTAPPEND_INSTALL conditional expansion manually to avoid expansion bug/feature on repetitive calls to lh_config (Closes: #488672)
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 591eb07d2..4bf3f749d 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}" ]