diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-01-29 07:05:33 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-01-29 07:05:33 -0500 |
| commit | ecb3ae1ed2a66c0ddc5be25f6cba9fe6c0a0345a (patch) | |
| tree | b1e4684832f75b5553efce456f26feec5e126f2f /scripts/install | |
| parent | 42acee1d418bea6de4fd5f983852bec52e66c05e (diff) | |
| download | vyatta-cfg-system-ecb3ae1ed2a66c0ddc5be25f6cba9fe6c0a0345a.tar.gz vyatta-cfg-system-ecb3ae1ed2a66c0ddc5be25f6cba9fe6c0a0345a.zip | |
Refine getting 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 0a1f5d13..720ac28a 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=`cat /opt/vyatta/etc/version` + ver=`cat /opt/vyatta/etc/version | awk '{print $2}'` 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=`cat /opt/vyatta/etc/version` + ver=`cat /opt/vyatta/etc/version | awk '{print $2}'` echo $ver return fi diff --git a/scripts/install/install-image b/scripts/install/install-image index d093d80d..fd10d0c3 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=`cat /opt/vyatta/etc/version` + vyos_version=`cat /opt/vyatta/etc/version | awk '{print $2}'` filename="${TEMP_DIR}/${NEW_ISO##*/}" curl -L -H "User-Agent: VyOS/$vyos_version" $auth -f -o $filename $NEW_ISO |