[SCM] live-build branch, debian, updated. debian/3.0_a31-1-16-g0b08f45

Daniel Baumann daniel at debian.org
Tue Sep 27 20:58:57 UTC 2011


The following commit has been merged in the debian branch:
commit 7b9ecc797687faf37fe608610bc930f08953e332
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 14 21:18:15 2011 +0200

    Switching away from cdn.debian.net as default mirrors for progress, too unreliable outside of Europe.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 906bf2c..796724e 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -342,7 +342,7 @@ Set_defaults ()
 			;;
 
 		progress)
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://cdn.debian.net/debian/}"
+			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.progress-linux.org/progress/}"
 			;;
 
@@ -377,7 +377,7 @@ Set_defaults ()
 			;;
 
 		progress)
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://cdn.debian.net/debian-security/}"
+			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
 
@@ -453,7 +453,7 @@ Set_defaults ()
 			;;
 
 		progress)
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://cdn.debian.net/debian/}"
+			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}"
 			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
 			;;
 
@@ -490,7 +490,7 @@ Set_defaults ()
 			;;
 
 		progress)
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://cdn.debian.net/debian-security/}"
+			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
 

-- 
live-build



More information about the debian-live-changes mailing list