[Debian-live-changes] r1124 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-22 09:15:10 +0000 (Sun, 22 Apr 2007)
New Revision: 1124

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_chroot_sources
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-22 09:00:17 UTC (rev 1123)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-22 09:15:10 UTC (rev 1124)
@@ -2,6 +2,9 @@
 
 	* helpers/lh_binary_grub:
 	  - Making copy call of grub arch independent.
+	* helpers/lh_chroot_sources:
+	  - In debian mode, checking for non-sid rather than if-etch.
+	  - Fixed wrong Ubuntu security URL.
 
 2007-04-20  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-22 09:00:17 UTC (rev 1123)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-22 09:15:10 UTC (rev 1124)
@@ -57,15 +57,28 @@
 
 		if [ "${LIVE_SECURITY}" = "enabled" ]
 		then
-			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
-			then
-				echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+			case "${LH_MODE}" in
+				debian)
+					if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
-				if [ "${LIVE_SOURCE}" = "yes" ]
-				then
-					echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-				fi
-			fi
+						if [ "${LIVE_SOURCE}" = "enabled" ]
+						then
+							echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LIVE_SOURCE}" = "enabled" ]
+					then
+						echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
 		fi
 
 		# Check local sources.list
@@ -158,15 +171,28 @@
 
 			if [ "${LIVE_SECURITY}" = "enabled" ]
 			then
-				if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ]
-				then
-					echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+				case "${LH_MODE}" in
+					debian)
+						if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+						then
+							echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
-					if [ "${LIVE_SOURCE}" = "yes" ]
-					then
-						echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-					fi
-				fi
+							if [ "${LIVE_SOURCE}" = "enabled" ]
+							then
+								echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+							fi
+						fi
+						;;
+
+					ubuntu)
+						echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LIVE_SOURCE}" = "enabled" ]
+						then
+							echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						fi
+						;;
+				esac
 			fi
 
 			# Check local sources.list