summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-04 11:25:19 +0100
committerDaniel Baumann <daniel@debian.org>2012-12-04 11:25:19 +0100
commitd6a2c442f9f22a4ec99e9127c205f820db8dce58 (patch)
tree887462712aef9081a72581dd173f4e582031e8e4 /functions
parent0da4e6e3e3386b04cf08ed54adfe65fa2c1d8c55 (diff)
downloadvyos-live-build-d6a2c442f9f22a4ec99e9127c205f820db8dce58.tar.gz
vyos-live-build-d6a2c442f9f22a4ec99e9127c205f820db8dce58.zip
Updating version config tree version check (Closes: #695091).
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index f1d969372..f76703f36 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1176,19 +1176,18 @@ Check_defaults ()
# except when bootstrapping the functions/defaults etc.).
CURRENT_CONFIG_VERSION="$(echo ${LB_CONFIG_VERSION} | awk -F. '{ print $1 }')"
- if [ ${CURRENT_CONFIG_VERSION} -ge 4 ]
+ if [ ${CURRENT_CONFIG_VERSION} -ge 5 ]
then
Echo_error "This config tree is too new for this version of live-build (${VERSION})."
Echo_error "Aborting build, please get a new version of live-build."
exit 1
- elif [ ${CURRENT_CONFIG_VERSION} -eq 2 ]
+ elif [ ${CURRENT_CONFIG_VERSION} -eq 3 ]
then
Echo_error "This config tree is too old for this version of live-build (${VERSION})."
Echo_error "Aborting build, please repopulate the config tree."
exit 1
- elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
- then
+ else
Echo_warning "This config tree does not specify a format version or has an unknown version number."
Echo_warning "Continuing build, but it could lead to errors or different results. Please repopulate the config tree."
fi