diff options
Diffstat (limited to 'scripts/build/lb_chroot_sources')
| -rwxr-xr-x | scripts/build/lb_chroot_sources | 70 |
1 files changed, 21 insertions, 49 deletions
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index 2bb05ec60..60654dc4d 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -88,25 +88,15 @@ EOF then case "${LB_MODE}" in debian|debian-release) - case "${LB_DISTRIBUTION}" in - lenny) - 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 - ;; - - squeeze) - echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] + then + 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 + fi ;; ubuntu) @@ -161,14 +151,6 @@ 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 @@ -181,13 +163,13 @@ EOF # Adding sources.list entries (chroot) if [ -e "${PLACE}/${REPOSITORY}.chroot" ] then - sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_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@|${_DISTRIBUTION}|g" \ + sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ "${PLACE}/${REPOSITORY}" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" @@ -542,25 +524,15 @@ EOF then case "${LB_MODE}" in debian|debian-release) - case "${LB_DISTRIBUTION}" in - lenny) - 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 - ;; - - squeeze) - echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] + then + 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 + fi ;; ubuntu) |