summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-27 16:19:41 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:25 +0100
commitb887266fa09a0d3dc8b1413e9fd35f756c725c19 (patch)
tree4a281f637f1f55f2e7028a1939090be40e609d80
parent6f322109ea17ce42cc0257f53833e373670cc8bf (diff)
downloadlive-build-b887266fa09a0d3dc8b1413e9fd35f756c725c19.zip
live-build-b887266fa09a0d3dc8b1413e9fd35f756c725c19.tar.gz
Handling live.debian.net repository differently, so that ubuntu people can use it too.
-rwxr-xr-xscripts/build/lb_chroot_sources12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 60654dc..334803a 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -151,6 +151,14 @@ EOF
then
for REPOSITORY in ${LB_REPOSITORIES}
do
+ # ubuntu workaround to allow using live.debian.net
+ if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ]
+ then
+ _DISTRIBUTION="sid"
+ else
+ _DISTRIBUTION="${LB_DISTRIBUTION}"
+ fi
+
for PLACE in config/repositories "${LB_BASE}/repositories"
do
# Prefer repositories from the config tree
@@ -163,13 +171,13 @@ EOF
# Adding sources.list entries (chroot)
if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
then
- sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}.chroot" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
elif [ -e "${PLACE}/${REPOSITORY}" ]
then
- sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"