[SCM] live-build branch, debian-next, updated. debian/2.0_a29-1-17-g113ddd0

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 113ddd069dda19136bdd51d79eca25a8dfbee776
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 26 10:37:54 2010 +0200

    Not fail if /dev/random is not available in chroot, newer debootstrap seems not to create it anymore.

diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 17cb3f5..60654dc 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -268,8 +268,11 @@ EOF
 					# Temporarily replace /dev/random with /dev/urandom so as not
 					# to block automated image builds; we don't care about the
 					# security of this key anyway.
-					mv chroot/dev/random chroot/dev/random.orig
-					cp -a chroot/dev/urandom chroot/dev/random
+					if [ -e chroot/dev/random ]
+					then
+						mv chroot/dev/random chroot/dev/random.orig
+						cp -a chroot/dev/urandom chroot/dev/random
+					fi
 
 					if Find_files cache/local-package-keyring.*
 					then
@@ -318,7 +321,10 @@ EOF
 					rm chroot/root/local-package-keyring.sec
 
 					# Revert /dev/random
-					mv chroot/dev/random.orig chroot/dev/random
+					if [ -e chroot/dev/random.orig ]
+					then
+						mv chroot/dev/random.orig chroot/dev/random
+					fi
 
 					# Remove /root/.gnupg if we created it during the signing process
 					if [ "${_LB_DOTGNUPG_EXISTED}" -eq 0 ]

-- 
live-build