[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 143e793eb7afc1702f63dd724fca787173b79fe1
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 21 18:44:22 2011 +0200

    Updating derivatives handling for d-i mirror defaults to better match the reality that by default, most derivatives are not going to actually rebuild d-i.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 30cf6f0..436b19d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -539,13 +539,13 @@ Set_defaults ()
 
 	case "${LB_MODE}" in
 		progress)
-			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
+			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
 			LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
 			;;
 
 		*)
-			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
-			LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_DEBIAN_INSTALLER}}"
+			LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
+			LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
 			;;
 	esac
 

-- 
live-build