diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-14 21:02:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-14 21:02:17 +0200 |
| commit | b1cfba42e7262d4251d5dce4edd735416dd9a834 (patch) | |
| tree | c2499cb4715f995f07505effbe089d1c2101186d /scripts/build | |
| parent | 893e1ac5c468fe182c2d709c2a9c7be405b06288 (diff) | |
| download | vyos-live-build-b1cfba42e7262d4251d5dce4edd735416dd9a834.tar.gz vyos-live-build-b1cfba42e7262d4251d5dce4edd735416dd9a834.zip | |
Making sure that volatile for the parent distribution is still included in derivatives mode.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index d14dac899..a8b3b6aea 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -152,16 +152,12 @@ EOF if [ "${LB_VOLATILE}" = "true" ] then - case "${LB_MODE}" in - debian|ubuntu|kubuntu) - echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] - then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] + then + echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_VOLATILE}" != "none" ] then @@ -713,16 +709,12 @@ EOF if [ "${LB_VOLATILE}" = "true" ] then - case "${LB_MODE}" in - debian|ubuntu|kubuntu) - echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] - then - echo "deb-src ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - fi - ;; - esac + if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] + then + echo "deb-src ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_VOLATILE}" != "none" ] then |