[SCM] live-helper branch, debian, updated. debian/2.0_a8-1-36-ga44b663

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit ca8429ebf4727221bc55b5b7075a2acaf4d7d415
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 11 18:03:29 2010 +0100

    Adding update repositories as volatile when building in ubuntu mode (Closes: #572983).

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 05ab2fc..0862254 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -344,6 +344,18 @@ Set_defaults ()
 						;;
 				esac
 				;;
+
+			ubuntu)
+				case "${LH_ARCHITECTURE}" in
+					amd64|i386)
+						LH_MIRROR_CHROOT_VOLATILE="http://security.ubuntu.com/ubuntu/"
+						;;
+
+					*)
+						LH_MIRROR_CHROOT_VOLATILE="http://ports.ubuntu.com/"
+						;;
+				esac
+				;;
 		esac
 
 		LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE:-none}"
@@ -412,6 +424,18 @@ Set_defaults ()
 						;;
 				esac
 				;;
+
+			ubuntu)
+				case "${LH_ARCHITECTURE}" in
+					amd64|i386)
+						LH_MIRROR_BINARY_VOLATILE="http://security.ubuntu.com/ubuntu/"
+						;;
+
+					*)
+						LH_MIRROR_BINARY_VOLATILE="http://ports.ubuntu.com/"
+						;;
+				esac
+				;;
 		esac
 
 		LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE:-none}"
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 87db111..8e456fd 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -77,15 +77,28 @@ case "${1}" in
 
 		if [ "${LH_VOLATILE}" = "true" ]
 		then
-			if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-			then
-				echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+			case "${LH_MODE}" in
+				debian|debian-release)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-				if [ "${LH_SOURCE}" = "true" ]
-				then
-					echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-				fi
-			fi
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
 		fi
 
 		# Check local sources.list
@@ -416,15 +429,28 @@ case "${1}" in
 
 		if [ "${LH_VOLATILE}" = "true" ]
 		then
-			if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-			then
-				echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+			case "${LH_MODE}" in
+				debian|debian-release)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-				if [ "${LH_SOURCE}" = "true" ]
-				then
-					echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-				fi
-			fi
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
 		fi
 
 		# Check local sources.list

-- 
live-helper