[SCM] live-build branch, debian, updated. debian/3.0_a20-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 7b84bf949854474368c9690e56d472fc9ba94907
Author: Colin Watson <cjwatson at canonical.com>
Date:   Sat Jun 11 13:31:08 2011 +0200

    Use dpkg --force-unsafe-io if available (Closes: #630043).

diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index 64c8085..819dbda 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -53,6 +53,14 @@ EOF
 
 		chmod 755 chroot/sbin/start-stop-daemon
 
+		# Disable dpkg syncing
+		if echo 'dpkg --compare-versions "$(dpkg-query -W --showformat="\${Version}" dpkg)" ge 1.15.8.6' | Chroot chroot sh
+		then
+			cat > chroot/etc/dpkg/dpkg.cfg.d/live-build << EOF
+force-unsafe-io
+EOF
+		fi
+
 		# Manual hacks for special packages
 
 		# samhain
@@ -95,6 +103,9 @@ EOF
 			mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
 		fi
 
+		# Remove dpkg sync configuration
+		rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build
+
 		# Removing stage file
 		rm -f .stage/chroot_dpkg
 		;;

-- 
live-build