diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-06 18:39:35 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 16:54:31 +0000 |
| commit | 41738b1932f0830a2b7eb92e62540a2246105a11 (patch) | |
| tree | 58bf5f2c7f4249eff18ec8f1231e3a1103afdabb | |
| parent | cb44c128e01f9408ba5bf9dbf6ce9dc8bb2c184e (diff) | |
| download | vyos-live-build-41738b1932f0830a2b7eb92e62540a2246105a11.tar.gz vyos-live-build-41738b1932f0830a2b7eb92e62540a2246105a11.zip | |
config: s/LIVE_CONFIGURATION_VERSION/LB_CONFIGURATION_VERSION/
| -rwxr-xr-x | functions/configuration.sh | 3 | ||||
| -rwxr-xr-x | scripts/build/config | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh index 8f52739e1..de7ac0f9b 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -31,7 +31,8 @@ Prepare_config () _QUIET="${_QUIET:-false}" _VERBOSE="${_VERBOSE:-false}" - LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}" + LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}" + LIVE_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}" #for backwards compatibility with hooks LB_SYSTEM="${LB_SYSTEM:-live}" diff --git a/scripts/build/config b/scripts/build/config index eb7fd745c..f588c4745 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -973,8 +973,8 @@ fi cat > config/common << EOF # config/common - common options for live-build(7) -# \$LIVE_CONFIGURATION_VERSION: version of live-build used to build config (config format version) -LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION}" +# \$LB_CONFIGURATION_VERSION: version of live-build used to build config (config format version) +LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}" # \$LB_APT: set package manager LB_APT="${LB_APT}" |