summaryrefslogtreecommitdiff
path: root/scripts/build/source_disk
diff options
context:
space:
mode:
authorRaphaël Hertzog <raphael@offensive-security.com>2019-12-19 18:18:44 +0100
committerRaphaël Hertzog <raphael@offensive-security.com>2019-12-19 18:18:44 +0100
commit44b9b0a6501476de594ce3783cea5df0c141478c (patch)
treedd84f8ea71c77fc5774a736db95f7669e1e58c2b /scripts/build/source_disk
parente7221c02f3baae0eaeb804b573551ad883d95290 (diff)
downloadvyos-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/source_disk')
-rwxr-xr-xscripts/build/source_disk4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index eaaf7d2dd..291a40357 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -49,8 +49,8 @@ Create_lockfile .lock
mkdir -p source/.disk
-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