[SCM] debian-live/live-helper branch, master, updated. 1.0_a37-2-57-gc6fa0ca

[Daniel Baumann]

The following commit has been merged in the master branch:
commit fd315529e0fc3ed65ca4f2d17da4f62389caa9b6
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Feb 21 20:46:49 2008 +0100

    Renaming extra bootstrap indices to chroot.

diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 6cb0b3e..2b4e8a2 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -71,12 +71,12 @@ case "${1}" in
 		fi
 
 		# Check local sources.list
-		if ls config/chroot_sources/*.bootstrap > /dev/null 2>&1
+		if ls config/chroot_sources/*.chroot > /dev/null 2>&1
 		then
 			echo "" >> chroot/etc/apt/sources.list
 			echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-			for FILE in config/chroot_sources/*.bootstrap
+			for FILE in config/chroot_sources/*.chroot
 			do
 				cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 			done
@@ -126,9 +126,9 @@ case "${1}" in
 			fi
 		else # Get fresh indices
 			# Check local gpg keys
-			if ls config/chroot_sources/*.bootstrap.gpg > /dev/null 2>&1
+			if ls config/chroot_sources/*.chroot.gpg > /dev/null 2>&1
 			then
-				for FILE in config/chroot_sources/*.bootstrap.gpg
+				for FILE in config/chroot_sources/*.chroot.gpg
 				do
 					cp ${FILE} chroot/root
 					Chroot "apt-key add /root/$(basename ${FILE})"

-- 
debian-live/live-helper