diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-03 18:02:04 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-03 23:20:39 +0100 |
| commit | 9bc35759aab95d849cba38bcb6fd1bb072df9907 (patch) | |
| tree | 80788a2ca43cc983d805d2473c9b6dcb5625f1fe /scripts | |
| parent | 26a89a45e5c5311cfd43c3a3e37e18686462e402 (diff) | |
| download | vyos-live-build-9bc35759aab95d849cba38bcb6fd1bb072df9907.tar.gz vyos-live-build-9bc35759aab95d849cba38bcb6fd1bb072df9907.zip | |
config: fix stale live-build version in iso-preparer
using `$VERSION` as part of the default `$LB_ISO_PREPARER` means that when
you simply run `lb config` once, this variable is stored as a part of the
string, and replaced on use, but if you run `lb config` twice, it gets
replaced with a fixed version, that is then used in all subsequent builds.
let's replace with a placeholder (`@LB_VERSION@`) that can be used both in
the default, or in user strings, and will be replaced on use only.
this means that subsequent builds will always reflect the actual version
of live-build used.
Gbp-Dch: Ignore
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_iso | 1 | ||||
| -rwxr-xr-x | scripts/build/source_iso | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 4fdbfdc57..ddd70b6c9 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -88,6 +88,7 @@ fi if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ] then + LB_ISO_PREPARER="$(echo "${LB_ISO_PREPARER}" | sed "s|@LB_VERSION@|${VERSION}|")" XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\"" fi diff --git a/scripts/build/source_iso b/scripts/build/source_iso index 3c9c08125..7c4f67f17 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -79,6 +79,7 @@ fi if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ] then + LB_ISO_PREPARER="$(echo "${LB_ISO_PREPARER}" | sed "s|@LB_VERSION@|${VERSION}|")" XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\"" fi |