summaryrefslogtreecommitdiff
path: root/scripts/install/install-image
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-03-08 17:36:22 -0800
committerBob Gilligan <gilligan@vyatta.com>2010-03-08 17:36:22 -0800
commit81df5c53d7dd6e7d3869ce96b3febc172e21611b (patch)
treec8b3a3d8e29a3952148ebf1a562d70da32d28512 /scripts/install/install-image
parentfb87a7ac196538f6e3eab6794f92bfe8be66b054 (diff)
downloadvyatta-cfg-system-81df5c53d7dd6e7d3869ce96b3febc172e21611b.tar.gz
vyatta-cfg-system-81df5c53d7dd6e7d3869ce96b3febc172e21611b.zip
Use more reliable method for determining system version.
Diffstat (limited to 'scripts/install/install-image')
-rwxr-xr-xscripts/install/install-image8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image
index fd306aec..f717588b 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -211,9 +211,13 @@ else
CURVER=$(get_cur_version)
fi
NEWVER=$(get_new_version)
-if [ -z "$CURVER" ] || [ -z "$NEWVER" ]; then
- fail_exit 'Cannot find release version.'
+if [ -z "$CURVER" ] ; then
+ fail_exit 'Cannot find current release version.'
fi
+if [ -z "$NEWVER" ] ; then
+ fail_exit 'Cannot find new release version.'
+fi
+
if [ "$CURVER" == "$NEWVER" ]; then
fail_exit "Version \"$NEWVER\" is already installed."
fi