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/binary_disk | |
| 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/binary_disk')
| -rwxr-xr-x | scripts/build/binary_disk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 7175a543a..d9fefa4b0 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -49,8 +49,8 @@ Create_lockfile .lock mkdir -p binary/.disk ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" -DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" -DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" +DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 1 | tr '[a-z]' '[A-Z]')" +DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION_BINARY} | cut -b 2-)" if [ -e chroot/etc/os-release ] then @@ -111,7 +111,7 @@ case "${LB_DEBIAN_INSTALLER}" in do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include continue fi @@ -136,7 +136,7 @@ case "${LB_DEBIAN_INSTALLER}" in do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include continue fi @@ -159,7 +159,7 @@ case "${LB_DEBIAN_INSTALLER}" in do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include continue fi |