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

[Daniel Baumann]

Author: daniel
Date: 2007-04-15 16:30:43 +0000 (Sun, 15 Apr 2007)
New Revision: 1063

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/examples/bpo.sources.list
   dists/trunk/live-helper/examples/live.sources.list
   dists/trunk/live-helper/helpers/lh_chroot_sources
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-15 16:10:31 UTC (rev 1062)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-15 16:30:43 UTC (rev 1063)
@@ -1,5 +1,9 @@
 2007-04-15  Daniel Baumann  <daniel at debian.org>
 
+	* functions/defaults.sh:
+	  - Set LH_APT to apt-get when using mini or minimal.
+	* helpers/lh_chroot_sources:
+	  - Excluding comments from local sources lists.
 	* helpers/lh_bootstrap_cdebootstrap:
 	  - Removing imported configuration files by cdebootstrap.
 

Modified: dists/trunk/live-helper/examples/bpo.sources.list
===================================================================
--- dists/trunk/live-helper/examples/bpo.sources.list	2007-04-15 16:10:31 UTC (rev 1062)
+++ dists/trunk/live-helper/examples/bpo.sources.list	2007-04-15 16:30:43 UTC (rev 1063)
@@ -1,8 +1,8 @@
-# This is a sources.list for live-helper(7) to use packages from the
-# Debian Etch backports repository.
-#
-# To enable it, copy this file to your config/chroot_sources directory, once
-# as e.g. bpo.build and once as bpo.image.
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. bpo.build and once as bpo.image.
 
 # Debian backports for Etch
 deb http://www.backports.org/debian/ etch-backports main

Modified: dists/trunk/live-helper/examples/live.sources.list
===================================================================
--- dists/trunk/live-helper/examples/live.sources.list	2007-04-15 16:10:31 UTC (rev 1062)
+++ dists/trunk/live-helper/examples/live.sources.list	2007-04-15 16:30:43 UTC (rev 1063)
@@ -1,8 +1,10 @@
-# This is a sources.list for live-helper(7) to use packages from the
-# Debian Live Etch backports repository.
-#
-# To enable it, copy this file to your config/chroot_sources directory, once
-# as e.g. live.build and once as live.image.
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live.build and once as live.image.
+##
+## Remeber to add debian-unofficial-archive-keyring to your package selection.
 
 # Debian Live backports for Etch
 deb http://live.debian.net/debian/ etch main

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-15 16:10:31 UTC (rev 1062)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-04-15 16:30:43 UTC (rev 1063)
@@ -76,7 +76,7 @@
 
 			for FILE in config/chroot_sources/*.build
 			do
-				cat ${FILE} >> chroot/etc/apt/sources.list
+				cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 			done
 		fi
 
@@ -175,9 +175,9 @@
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-				for FILE in config/chroot_sources/*.image
+				for FILE in config/chroot_sources/*.build
 				do
-					cat ${FILE} >> chroot/etc/apt/sources.list
+					cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 				done
 			fi