[SCM] live-build branch, debian, updated. debian/3.0_a42-1-25-g6c98972

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cc9fb10e25736c99dfacaf92b5d5df3b96d80f59
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 4 20:08:00 2012 +0100

    Removing removal of bootstrap-base udeb in binary_debian-installer.
    
    If both bootstrap-base and live-installer are available on the installer,
    live-installer is prefereded by d-i (because of the live specific .disk info).
    
    If live-installer is included, can be disabled with live-installer/enable=false
    and d-i will use bootstrap-base in order to debootstrap the base system on
    /target.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 2135b8c..793ba53 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -604,16 +604,6 @@ then
 		rm -f ${EXCLUDE}_*.udeb
 	done < exclude
 
-	# Enable live-installer
-	if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
-	then
-		# Remove local udebs
-		rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
-
-		# Remove d-i udebs
-		rm -f bootstrap-base_*.udeb
-	fi
-
 	# Moving udebs
 	for UDEB in ${UDEBS}
 	do

-- 
live-build