summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/install/install-functions4
-rwxr-xr-xscripts/install/install-image2
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