[SCM] live-build branch, debian, updated. debian/3.0_a37-1-26-g739cd67

Daniel Baumann daniel at debian.org
Mon Nov 14 11:49:19 UTC 2011


The following commit has been merged in the debian branch:
commit fda0dfab52d6ad301ab3633efa0e36334041e813
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 30 09:49:41 2011 +0100

    Adding temporary manual setting of d-i urls for progress.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 55691a6..577fe9f 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -266,6 +266,13 @@ case "${LB_DERIVATIVE}" in
 		else
 			URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
 		fi
+
+		if [ "${LB_MODE}" = "progress" ]
+		then
+			# FIXME: normal derivatives probably don't rebuild d-i,
+			# but progress does.
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+		fi
 		;;
 esac
 

-- 
live-build



More information about the debian-live-changes mailing list