summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-12-08 11:22:34 -0800
committerJohn Southworth <john.southworth@vyatta.com>2011-12-08 11:22:34 -0800
commit7bf6a268baad4394447ccca0fdcfaa9143a8b869 (patch)
tree46ad6066c4c4f97149442a70fb10ef0c96be84d6
parent5974f4d6a757c9219f13266df7b714d31fa6b7eb (diff)
parent2ab0998b540bdc57fb15717672fb468d990e9280 (diff)
downloadvyatta-cfg-system-7bf6a268baad4394447ccca0fdcfaa9143a8b869.tar.gz
vyatta-cfg-system-7bf6a268baad4394447ccca0fdcfaa9143a8b869.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
-rw-r--r--debian/changelog7
-rwxr-xr-xscripts/install/install-image2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 95ab609e..6ffd7647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.19.141) unstable; urgency=low
+
+ * Bugfix 7497: Include auth credentials when fetching the signature
+ file
+
+ -- Bob Gilligan <gilligan@vyatta.com> Tue, 06 Dec 2011 16:16:02 -0800
+
vyatta-cfg-system (0.19.140) unstable; urgency=low
* Fix up formating of Vyatta specific HTTP options.
diff --git a/scripts/install/install-image b/scripts/install/install-image
index b5061b26..95acd733 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -82,7 +82,7 @@ fetch_iso_by_url ()
echo "ISO download suceeded."
echo "Checking for digital signature file..."
- curl "$client_hdr" "$vers_hdr" -f -o ${filename}.asc ${NEW_ISO}.asc
+ curl "$client_hdr" "$vers_hdr" $auth -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] "