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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e1c0323afe8f478e06f6613e2dfa9b21540221e4
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 6 15:38:13 2012 +0100

    Avoid using subdirectories to workaround chroot limitations when dereferencing embeddded bootloader configs.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 6668a34..19fc734 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -141,11 +141,11 @@ case "${LB_BUILD_WITH_CHROOT}" in
 		if [ "${LB_SYSLINUX_THEME}" = "live-build" ]
 		then
 			mkdir chroot/root/tmp
-			cp -a "${_SOURCE}" chroot/root
-			Chroot chroot "cp -aL /root/$(basename ${_SOURCE})/* /root/tmp"
-			rm -rf chroot/root/$(basename ${_SOURCE})
+			cp -a "${_SOURCE}" chroot
+			Chroot chroot "cp -aL $(basename ${_SOURCE})/* $(basename ${_SOURCE}).tmp"
+			rm -rf chroot/$(basename ${_SOURCE})
 		else
-			Chroot chroot "cp -aL ${_SOURCE} /root/tmp"
+			Chroot chroot cp -aL "${_SOURCE}" "$(basename ${_SOURCE}).tmp"
 		fi
 
 		case "${LB_MODE}" in

-- 
live-build