[SCM] debian-live branch, master, updated. 1.0_a47-1-76-g16a4578

[Chris Lamb]

The following commit has been merged in the master branch:
commit bb897a80a524c3762b19e92437ca489eee36f53d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jul 13 02:42:46 2008 +0100

    Temporarily replace /dev/urandom with /dev/random when creating local packages key.
    
    This avoids blocking automated mage builds; we don't care about the
    security of this key anyway.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index cecba95..b888c4a 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -127,6 +127,12 @@ case "${1}" in
 					# Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
 					mkdir -p chroot/root/.gnupg
 
+					# Temporarily replace /dev/urandom with /dev/random 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 ls cache/local-package-keyring.* >/dev/null 2>&1
 					then
 						cp cache/local-package-keyring.* chroot/root
@@ -173,6 +179,9 @@ case "${1}" in
 					rm chroot/root/local-package-keyring.pub
 					rm chroot/root/local-package-keyring.sec
 
+					# Revert /dev/random
+					mv chroot/dev/random.orig chroot/dev/random
+
 					# Remove /root/.gnupg if we created it during the signing process
 					if [ "${_LH_DOTGNUPG_EXISTED}" -eq 0 ]
 					then

-- 
debian-live