[SCM] debian-live branch, master, updated. 1.0_a47-1-63-gd3f15a3

[Chris Lamb]

The following commit has been merged in the master branch:
commit d3f15a317f6f6711f24ec057c6193bd6589222f0
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Jul 5 00:54:00 2008 +0100

    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 at chris-lamb.co.uk>

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}" ]

-- 
debian-live