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

[Daniel Baumann]

Author: daniel
Date: 2007-04-07 22:12:27 +0000 (Sat, 07 Apr 2007)
New Revision: 975

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


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-07 21:25:55 UTC (rev 974)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-07 22:12:27 UTC (rev 975)
@@ -1,3 +1,9 @@
+2007-04-08  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_sources:
+	  - Moved check for local from config/sources.lists.{build,image} to
+	    config/chroot_sources/*.{build,image}.
+
 2007-04-06  Daniel Baumann  <daniel at debian.org>
 
 	* functions/breakpoints.sh, helpers/*:

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-07 21:25:55 UTC (rev 974)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-07 22:12:27 UTC (rev 975)
@@ -69,11 +69,15 @@
 		fi
 
 		# Check local sources.list
-		if [ -f config/sources.list.build ]
+		if ls config/chroot_sources/*.build &> /dev/null
 		then
 			echo "" >> chroot/etc/apt/sources.list
 			echo "# Custom repositories" >> chroot/etc/apt/sources.list
-			cat config/sources.list.build >> chroot/etc/apt/sources.list
+
+			for FILE in config/chroot_sources/*.build
+			do
+				cat ${FILE} >> chroot/etc/apt/sources.list
+			done
 		fi
 
 		# Installing aptitude
@@ -124,11 +128,15 @@
 			fi
 
 			# Check local sources.list
-			if [ -f config/sources.list.image ]
+			if ls config/chroot_sources/*.image &> /dev/null
 			then
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
-				cat config/sources.list.image >> chroot/etc/apt/sources.list
+
+				for FILE in config/chroot_sources/*.image
+				do
+					cat ${FILE} >> chroot/etc/apt/sources.list
+				done
 			fi
 
 			case "${LH_APT}" in

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-04-07 21:25:55 UTC (rev 974)
+++ dists/trunk/live-helper/helpers/lh_config	2007-04-07 22:12:27 UTC (rev 975)
@@ -174,6 +174,7 @@
 install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localincludes || true
 install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localpackages || true
 install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localpackageslists || true
+install -d -m 0755 "${LIVE_ROOT}"/config/chroot_sources || true
 
 # Creating lh_bootstrap_* configuration
 cat > "${LIVE_ROOT}"/config/bootstrap << EOF