summaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-12-06 11:08:47 -0800
committerStephen Hemminger <shemminger@vyatta.com>2011-12-06 11:08:47 -0800
commit2056a4e39f8d7de951aea856efd676f173f0f3a9 (patch)
tree5bb481c06ba0d9bd62aca48e2ee377b77731c1eb /scripts/install
parent8426b9dcd6ddbe8c627b925e2d31f86a299ffa2f (diff)
parentfa84fe0e3b0f2fac340ac8e51148d47006a1880f (diff)
downloadvyatta-cfg-system-2056a4e39f8d7de951aea856efd676f173f0f3a9.tar.gz
vyatta-cfg-system-2056a4e39f8d7de951aea856efd676f173f0f3a9.zip
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'scripts/install')
-rwxr-xr-xscripts/install/install-image8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image
index 5abef7ca..ea8cfd7f 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -62,8 +62,12 @@ fetch_iso_by_url ()
auth=""
fi
+ client_hdr="-H vyatta-client: install-image"
+ vyatta_version=`dpkg-query --showformat='${Version}' --show vyatta-version`
+ vers_hdr="-H vyatta-version: $vyatta_version"
+
filename="${TEMP_DIR}/${NEW_ISO##*/}"
- curl $auth -f -o $filename $NEW_ISO
+ curl "$client_hdr" "$vers_hdr" $auth -f -o $filename $NEW_ISO
if [ $? -ne 0 ]; then
echo "Unable to fetch ISO from $NEW_ISO"
rm -f $filename
@@ -78,7 +82,7 @@ fetch_iso_by_url ()
echo "ISO download suceeded."
echo "Checking for digital signature file..."
- curl -f -o ${filename}.asc ${NEW_ISO}.asc
+ curl "$client_hdr" "$vers_hdr" -f -o ${filename}.asc ${NEW_ISO}.asc
if [ $? -ne 0 ]; then
echo "Unable to fetch digital signature file."
echo -n "Do you want to continue without signature check? (yes/no) [yes] "