[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-12-gdc0f709
Daniel Baumann
daniel at debian.org
Fri Apr 9 18:28:01 UTC 2010
The following commit has been merged in the debian-next branch:
commit dc0f70986f5872d6c9237e1c12ba32d40740b3eb
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 20:22:54 2010 +0200
Adding --repositories, part 2.
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 8e456fd..3ba6cc4 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -120,6 +120,21 @@ case "${1}" in
done
fi
+ # Configure third-party repositories
+ if [ -n "${LH_REPOSITORIES}" ]
+ then
+ for REPOSITORY in ${LH_REPOSITORIES}
+ do
+ if [ -e "${LH_BASE}/repositories/${REPOSITORY}.chroot" ]
+ then
+ cp "${LH_BASE}/repositories/${REPOSITORY}.chroot" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+ elif [ -e "${LH_BASE}/repositories/${REPOSITORY}" ]
+ then
+ cp "${LH_BASE}/repositories/${REPOSITORY}" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+ fi
+ done
+ fi
+
# Configure local package repository
if Find_files config/chroot_local-packages/*.deb
then
@@ -453,6 +468,23 @@ case "${1}" in
esac
fi
+ # Configure third-party repositories
+ if [ -n "${LH_REPOSITORIES}" ]
+ then
+ for REPOSITORY in ${LH_REPOSITORIES}
+ do
+ rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+
+ if [ -e "${LH_BASE}/repositories/${REPOSITORY}.binary" ]
+ then
+ cp "${LH_BASE}/repositories/${REPOSITORY}.binary" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+ elif [ -e "${LH_BASE}/repositories/${REPOSITORY}" ]
+ then
+ cp "${LH_BASE}/repositories/${REPOSITORY}" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+ fi
+ done
+ fi
+
# Check local sources.list
if Find_files config/chroot_sources/*.binary
then
--
live-helper
More information about the debian-live-changes
mailing list