From 11e6561d93f7c648a920a4451ce25d5c9b78fc85 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Thu, 18 Feb 2010 18:02:56 -0800 Subject: Bugfix 5360: Get name of image from correct source. The name of a system image is supposed to match the Vyatta version string. Previously, the install-image script determined the name of the image being installed by parsing a field in the Vyatta version file on the image being installed. But the format of that file has changed, and may change again the future, so it is not a good source of the Vyatta version string. The most accurate way to determine the Vyatta version string is to look up the debian package version string associated with the vyatta-version package on the image being installed. This changes the install-image script to get the system image name that way. (cherry picked from commit e1864411c77e688b1b67de40441550b1f1eba055) --- scripts/install/install-image-existing | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/install/install-image-existing') diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index b566c1e9..1514d0a1 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -32,8 +32,8 @@ if [ -z "$CURVER" ]; then fi # get new version string. this is from the squashfs image. -NEWVER=$(grep '^Version ' ${CD_SQUASH_ROOT}${vyatta_sysconfdir}/version \ - | tr -s ' ' | cut -d ' ' -f 3) +NEWVER=`dpkg -l --root=${CD_SQUASH_ROOT} | grep "^ii vyatta-version" | awk '{print $3}'` + if [ -z "$NEWVER" ]; then failure_exit 'Cannot find new release version.' fi -- cgit v1.2.3