[SCM] live-build branch, debian-next, updated. debian/3.0_a8-1-1-g2e23222
Daniel Baumann
daniel at debian.org
Tue Nov 30 09:17:57 UTC 2010
The following commit has been merged in the debian-next branch:
commit 2e23222b3924d743b3948c44ae5acff8a3bd38f1
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 30 10:17:35 2010 +0100
Once again updating volatile urls for squeeze.
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 79e4232..5b77f65 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -87,16 +87,7 @@ EOF
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release)
- echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
- if [ "${LB_SOURCE}" = "true" ]
- then
- echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
- ;;
-
- ubuntu)
+ debian|debian-release|ubuntu)
echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
@@ -528,16 +519,7 @@ EOF
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release)
- echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
- if [ "${LB_SOURCE}" = "true" ]
- then
- echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
- ;;
-
- ubuntu)
+ debian|debian-release|ubuntu)
echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
--
live-build
More information about the debian-live-changes
mailing list