[SCM] debian-live branch, master, updated. 1.0_a48-1-95-ge11175e

[Chris Lamb]

The following commit has been merged in the master branch:
commit e11175ed2c6e06272874e48a4534d2da085e707e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 16 11:30:48 2008 +0100

    Correct logic in LH_BOOTAPPEND_INSTALL handling
    
    (LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a2db35d..3a3b423 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -578,11 +578,14 @@ Set_defaults ()
 		esac
 	fi
 
-	if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${_LH_BOOTAPPEND_PRESEED} ]
+	if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
 	then
-		LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
-	else
-		LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
+		if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
+		then
+			LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
+		else
+			LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
+		fi
 	fi
 
 	# Setting encryption

-- 
debian-live