diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-01-29 05:56:40 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-01-29 05:56:40 -0500 |
| commit | 79bffc87c0b0a4b6b35a190fa64adc34e5ff8005 (patch) | |
| tree | 49eb3e3b083e6694e02c76ebae3bb31821ba6457 /scripts/install | |
| parent | 13cf05ad949e8e622613b59084a39a776110fa99 (diff) | |
| download | vyatta-cfg-system-79bffc87c0b0a4b6b35a190fa64adc34e5ff8005.tar.gz vyatta-cfg-system-79bffc87c0b0a4b6b35a190fa64adc34e5ff8005.zip | |
Update the way the install scrips get the vyos version.
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-functions | 4 | ||||
| -rwxr-xr-x | scripts/install/install-image | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 8f30f8db..0a1f5d13 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -298,7 +298,7 @@ is_union_install () # outputs the version string of the current running version. get_cur_version () { - ver=`dpkg-query --showformat='${Version}' --show vyatta-version` + ver=`cat /opt/vyatta/etc/version` if [ -z "$ver" ]; then echo "UNKNOWN" else @@ -323,7 +323,7 @@ get_new_version () ver_file=${ver_path} if is_live_cd_boot && [ -f "$ver_file" ]; then # we are installing from a live CD boot - ver=`dpkg-query --showformat='${Version}' --show vyatta-version` + ver=`cat /opt/vyatta/etc/version` echo $ver return fi diff --git a/scripts/install/install-image b/scripts/install/install-image index c7323fbf..d093d80d 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -63,7 +63,7 @@ fetch_iso_by_url () fi # This is for statistics collection - vyos_version=`dpkg-query --showformat='${Version}' --show vyatta-version` + vyos_version=`cat /opt/vyatta/etc/version` filename="${TEMP_DIR}/${NEW_ISO##*/}" curl -L -H "User-Agent: VyOS/$vyos_version" $auth -f -o $filename $NEW_ISO |