summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-03-11 18:03:29 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:05 +0100
commit000ff0a0b04a8878b580eefc1a7c22486d7d4471 (patch)
tree5ef6f62a9f5c546149c2b499e98d6516e3c9556c /helpers
parenta625ce959b096c61f50c03c6b5e0be09df4bb11e (diff)
downloadvyos-live-build-000ff0a0b04a8878b580eefc1a7c22486d7d4471.tar.gz
vyos-live-build-000ff0a0b04a8878b580eefc1a7c22486d7d4471.zip
Adding update repositories as volatile when building in ubuntu mode (Closes: #572983).
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/chroot_sources58
1 files changed, 42 insertions, 16 deletions
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
index 87db111d9..8e456fdb0 100755
--- a/helpers/chroot_sources
+++ b/helpers/chroot_sources
@@ -77,15 +77,28 @@ case "${1}" in
if [ "${LH_VOLATILE}" = "true" ]
then
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ case "${LH_MODE}" in
+ debian|debian-release)
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
- then
- echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
- fi
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
fi
# Check local sources.list
@@ -416,15 +429,28 @@ case "${1}" in
if [ "${LH_VOLATILE}" = "true" ]
then
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ case "${LH_MODE}" in
+ debian|debian-release)
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
- fi
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
+ esac
fi
# Check local sources.list