[SCM] debian-live branch, master, updated. 1.0_a48-1-45-gebc302e

[Chris Lamb]

The following commit has been merged in the master branch:
commit 821e289e241d281d049c0e2cf42f45fe871cc176
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Aug 10 23:02:01 2008 +0100

    Don't include the bootstrap .debs on live-installer based disks (saves ~30MiB).
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 94e14ea..27afa7c 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -415,19 +415,22 @@ then
 		done
 	fi
 
-	# Including base debian packages
-	if [ -d cache/packages_bootstrap ]
+	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
 	then
-		for FILE in cache/packages_bootstrap/*.deb
-		do
-			Install_file "${FILE}" "binary/pool/main"
-		done
-	else
-		Echo_error "Could not find cache/packages_bootstrap."
-		Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and"
-		Echo_error "LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being"
-		Echo_error "cached - these are required when integrating the Debian Installer."
-		exit 1
+		# Including base debian packages
+		if [ -d cache/packages_bootstrap ]
+		then
+			for FILE in cache/packages_bootstrap/*.deb
+			do
+				Install_file "${FILE}" "binary/pool/main"
+			done
+		else
+			Echo_error "Could not find cache/packages_bootstrap."
+			Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and"
+			Echo_error "LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being"
+			Echo_error "cached - these are required when integrating the Debian Installer."
+			exit 1
+		fi
 	fi
 
 	# Including local debs

-- 
debian-live