diff options
| -rwxr-xr-x | scripts/install/install-functions | 7 | ||||
| -rwxr-xr-x | scripts/install/install-image-existing | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 5a77a0c6..3f85e75b 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -293,19 +293,20 @@ get_cur_version () # being installed. this can be from live CD boot or from a ISO image file. get_new_version () { - ver_path=/opt/vyatta/etc/version + ver_path=/var/lib/dpkg/status ver_file=${CD_SQUASH_ROOT}${ver_path} if [ -f "$ver_file" ]; then # CD_SQUASH_ROOT is set up => we are installing with a specified ISO # image file. use the version string from there. - grep '^Version' $ver_file | awk '{ print $3 }' + dpkg -l --root=${CD_SQUASH_ROOT} | \ + grep "^ii vyatta-version" | awk '{print $3}' return fi ver_file=${ver_path} if is_live_cd_boot && [ -f "$ver_file" ]; then # we are installing from a live CD boot - grep '^Version' $ver_file | awk '{ print $3 }' + dpkg -l | grep "^ii vyatta-version" | awk '{print $3}' return fi 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 |