diff options
| author | Raphaël Hertzog <raphael@offensive-security.com> | 2019-12-19 18:18:44 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <raphael@offensive-security.com> | 2019-12-19 18:18:44 +0100 |
| commit | 44b9b0a6501476de594ce3783cea5df0c141478c (patch) | |
| tree | dd84f8ea71c77fc5774a736db95f7669e1e58c2b /scripts/build/chroot_apt | |
| parent | e7221c02f3baae0eaeb804b573551ad883d95290 (diff) | |
| download | vyos-live-build-44b9b0a6501476de594ce3783cea5df0c141478c.tar.gz vyos-live-build-44b9b0a6501476de594ce3783cea5df0c141478c.zip | |
Support --distribution-binary and --distribution-chroot
This makes it possible to build an image against a first distribution
(--distribution-chroot) and have the resulting image point to another
distribution (--distribution-binary). We can use this to build against a
snapshot and have the result use the original distribution that was
snapshotted.
Closes: #888507
Diffstat (limited to 'scripts/build/chroot_apt')
| -rwxr-xr-x | scripts/build/chroot_apt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 4888ebd9c..21f53b35c 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -152,7 +152,7 @@ case "${1}" in progress-linux) if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ] then - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')" _ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}" _DISABLE_DISTRIBUTIONS="" @@ -167,7 +167,7 @@ case "${1}" in _ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates" fi - case "${LB_DISTRIBUTION}" in + case "${LB_DISTRIBUTION_BINARY}" in *-backports) if [ "${LB_BACKPORTS}" = "true" ] then |