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_syslinux | |
| 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_syslinux')
| -rwxr-xr-x | scripts/build/binary_syslinux | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index bb6658826..df58f7d62 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -204,7 +204,7 @@ fi _VERSION="${_VERSION:-none}" -_DISTRIBUTION="${LB_DISTRIBUTION}" +_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}" _ARCHITECTURE="${LB_ARCHITECTURES}" _DATE=$(date -R) @@ -242,7 +242,7 @@ do -e "s#@APPEND_INSTALL_FAILSAFE@#${LB_BOOTAPPEND_INSTALL_FAILSAFE}#g" \ -e "s|@PROJECT@|${_PROJECT}|g" \ -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \ -e "s|@VERSION@|${_VERSION}|g" \ -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \ -e "s|@DATE@|${_DATE}|g" \ |