summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-12-06 08:15:16 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-12-06 08:15:16 -0800
commit238a2cc3ac60a49628d1ce2af6c0083bcd41df25 (patch)
treebb89db01049834b4781aad020073c88637074c72 /scripts
parentacb1cb8976fb92893e399c1bf2f7a78e73a5eb8b (diff)
parent5058e65eac82aa1749d1884e573d93330834ab46 (diff)
downloadvyatta-cfg-system-238a2cc3ac60a49628d1ce2af6c0083bcd41df25.tar.gz
vyatta-cfg-system-238a2cc3ac60a49628d1ce2af6c0083bcd41df25.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'scripts')
-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] "