[SCM] live-build branch, debian-next, updated. debian/3.0_a10-1-19-gc26bce9

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9611b265f9f3964aaba67d870e314f347ba05904
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 7 21:18:27 2011 +0100

    Updating some defaults for progress.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 2299370..9e4f841 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -257,7 +257,7 @@ Set_defaults ()
 
 	# Setting mirror to fetch packages from
 	case "${LB_MODE}" in
-		debian|progress)
+		debian)
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ftp.de.debian.org/debian/}"
 			;;
 
@@ -265,6 +265,10 @@ Set_defaults ()
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://buildd.emdebian.org/grip/}"
 			;;
 
+		progress)
+			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.debian.net/debian/}"
+			;;
+
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
@@ -282,7 +286,7 @@ Set_defaults ()
 
 	# Setting security mirror to fetch packages from
 	case "${LB_MODE}" in
-		debian|progress)
+		debian)
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
 			;;
 
@@ -290,6 +294,10 @@ Set_defaults ()
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-none}"
 			;;
 
+		progress)
+			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://cdn.debian.net/debian-security/}"
+			;;
+
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
@@ -362,7 +370,7 @@ Set_defaults ()
 
 	# Setting security mirror which ends up in the image
 	case "${LB_MODE}" in
-		debian|progress)
+		debian)
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
 			;;
 
@@ -370,6 +378,10 @@ Set_defaults ()
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-none}"
 			;;
 
+		progress)
+			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://cdn.debian.net/debian-security/}"
+			;;
+
 		ubuntu)
 			case "${LB_ARCHITECTURES}" in
 				amd64|i386)
@@ -819,15 +831,7 @@ Set_defaults ()
 	# LB_GRUB_SPLASH
 
 	# Setting hostname
-	case "${LB_MODE}" in
-		debian)
-			LB_HOSTNAME="${LB_HOSTNAME:-debian}"
-			;;
-
-		*)
-			LB_HOSTNAME="${LB_HOSTNAME:-${LB_MODE}}"
-			;;
-	esac
+	LB_HOSTNAME="${LB_HOSTNAME:-${LB_MODE}}"
 
 	# Setting iso author
 	case "${LB_MODE}" in

-- 
live-build