diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2016-12-02 22:51:24 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-12-02 23:05:05 +0100 |
| commit | 61b92c654e0f21db7d3d4e7a1cc867cdb3988027 (patch) | |
| tree | b69e0d1617a46405afd855ea9af7ba16b0d8c560 /functions | |
| parent | f7bb86fd584b0e495ff4c675a60e505af9977036 (diff) | |
| download | vyos-live-build-61b92c654e0f21db7d3d4e7a1cc867cdb3988027.tar.gz vyos-live-build-61b92c654e0f21db7d3d4e7a1cc867cdb3988027.zip | |
Drop check on configuration version
The date based versioning scheme no longer allows such a check. And we
don't intend to break backwards compatibility for now.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index ad5771937..de3bb24e9 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -781,44 +781,6 @@ Set_defaults () Check_defaults () { - if [ -n "${LIVE_BUILD_VERSION}" ] - then - # We're only checking when we're actually running the checks - # that's why the check for emptyness of the version; - # however, as live-build always declares LIVE_BUILD_VERSION - # internally, this is safe assumption (no cases where it's unset, - # except when bootstrapping the functions/defaults etc.). - - CURRENT_CONFIGURATION_VERSION="$(echo ${LIVE_CONFIGURATION_VERSION} | awk -F. ' { print $1 }')" - - if [ -n "${CURRENT_CONFIGURATION_VERSION}" ] - then - CORRECT_VERSION="$(echo ${LIVE_BUILD_VERSION} | awk -F. '{ print $1 }')" - TOO_NEW_VERSION="$((${CORRECT_VERSION} + 1))" - TOO_OLD_VERSION="$((${CORRECT_VERSION} - 1))" - - if [ ${CURRENT_CONFIGURATION_VERSION} -ne ${CORRECT_VERSION} ] - then - if [ ${CURRENT_CONFIGURATION_VERSION} -ge ${TOO_NEW_VERSION} ] - then - Echo_error "This config tree is too new for live-build (${VERSION})." - Echo_error "Aborting build, please update live-build." - - exit 1 - elif [ ${CURRENT_CONFIGURATION_VERSION} -le ${TOO_OLD_VERSION} ] - then - Echo_error "This config tree is too old for live-build (${VERSION})." - Echo_error "Aborting build, please update the configuration." - - exit 1 - else - Echo_warning "This configuration does not specify a version or has a unknown version." - Echo_warning "Continuing build, please correct the configuration." - fi - fi - fi - fi - case "${LB_BINARY_FILESYSTEM}" in ntfs) if [ ! -x "$(which ntfs-3g 2>/dev/null)" ] |