[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-7-gcd3048d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit cd3048d00c8bf7e5669ae2c7b94b87ca3dabeb76
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 22 17:19:24 2010 +0200

    Moving chroot exclude mechanisms to one central place in binary_chroot helper.

diff --git a/helpers/binary_chroot b/helpers/binary_chroot
index 4b3c249..fb7dafe 100755
--- a/helpers/binary_chroot
+++ b/helpers/binary_chroot
@@ -110,6 +110,37 @@ then
 	done
 fi
 
+# Handling chroot excludes
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	if [ -f config/binary_rootfs/excludes ]
+	then
+		cp config/binary_rootfs/excludes chroot/chroot/excludes
+		chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
+		rm -f chroot/chroot/excludes
+	fi
+
+	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+	then
+		case "${LH_PACKAGES_LISTS}" in
+			stripped|minimal)
+				# kernel images
+				rm -f chroot/chroot/boot/${LINUX}*
+				rm -f chroot/chroot/boot/initrd.img*
+
+				# kernel symlinks
+				rm -f chroot/chroot/${LINUX}*
+				rm -f chroot/chroot/initrd.img*
+				;;
+		esac
+	fi
+else
+	if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ]
+	then
+		Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now."
+	fi
+fi
+
 if [ -n "${LH_ROOT_COMMAND}" ]
 then
 	${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
index c813d46..6d6b345 100755
--- a/helpers/binary_rootfs
+++ b/helpers/binary_rootfs
@@ -82,37 +82,6 @@ do
 	fi
 done
 
-# Handling chroot excludes
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	if [ -f config/binary_rootfs/excludes ]
-	then
-		cp config/binary_rootfs/excludes chroot/chroot/excludes
-		chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
-		rm -f chroot/chroot/excludes
-	fi
-
-	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
-	then
-		case "${LH_PACKAGES_LISTS}" in
-			stripped|minimal)
-				# kernel images
-				rm -f chroot/chroot/boot/${LINUX}*
-				rm -f chroot/chroot/boot/initrd.img*
-
-				# kernel symlinks
-				rm -f chroot/chroot/${LINUX}*
-				rm -f chroot/chroot/initrd.img*
-				;;
-		esac
-	fi
-else
-	if [ "${LH_CHROOT_FILESYSTEM}" != "squashfs" ]
-	then
-		Echo_warning "rootfs excludes are not supported on non-chrooted builds unless squashfs as chroot filesystem is used, thus ignoring excludes now."
-	fi
-fi
-
 case "${LH_CHROOT_FILESYSTEM}" in
 	ext2|ext3)
 		# Checking depends

-- 
live-helper