summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-02-21 20:46:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:36:06 +0100
commit953a3d1af6f82d93af4fed3ce98160cf83f1e099 (patch)
treeb7ff51bbd5cc30c330bc94e9cf38b9e3493496b4 /helpers
parent09f88a6e3837f71343dacb1bf7c6411183cca2cf (diff)
downloadlive-build-953a3d1af6f82d93af4fed3ce98160cf83f1e099.zip
live-build-953a3d1af6f82d93af4fed3ce98160cf83f1e099.tar.gz
Renaming extra bootstrap indices to chroot.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_chroot_sources8
1 files changed, 4 insertions, 4 deletions
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})"