From 9fbfa131b799b26e5a8db94bb5e60f7ab3069424 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 8 Jan 2010 17:14:23 -0800
Subject: Switch from wget to curl since the latter supports more URL methods.

---
 scripts/install/install-image | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/install/install-image b/scripts/install/install-image
index 76418158..507ee294 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -56,13 +56,13 @@ fetch_iso_by_url ()
     mkdir $TEMP_DIR
     echo "Trying to fetch ISO file from $NEW_ISO"
 
-    wget -P $TEMP_DIR $NEW_ISO
+    filename="${TEMP_DIR}/${NEW_ISO##*/}"
+    curl -# -f -o $filename $NEW_ISO
     if [ $? -ne 0 ]; then
 	echo "Unable to fetch ISO from $NEW_ISO"
 	exit 1
     fi
 
-    filename="${TEMP_DIR}/${NEW_ISO##*/}"
     if [ ! -e $filename ]; then
 	echo "Download of $NEW_ISO failed"
 	exit 1
@@ -79,7 +79,8 @@ set_up_new_iso ()
 
     if [ "$url_scheme" != "$NEW_ISO" ]; then
 	if [ "$url_scheme" = "http" -o "$url_scheme" = "https" -o \
-	    "$url_scheme" = "ftp" ]; then
+	    "$url_scheme" = "ftp" -o "$url_scheme" = "tftp" -o \
+	    "$url_scheme" = "scp" ]; then
 	    fetch_iso_by_url
 	fi
     fi
-- 
cgit v1.2.3


From fa5fa5f865ecb79da486bce623cf66c3d79ec41d Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 8 Jan 2010 17:15:36 -0800
Subject: 0.16.11

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65bae2ca..fa9bcd6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-system (0.16.11) unstable; urgency=low
+
+  * Switch from wget to curl since the latter supports more URL methods.
+
+ -- Bob Gilligan <gilligan@vyatta.com>  Fri, 08 Jan 2010 17:15:36 -0800
+
 vyatta-cfg-system (0.16.10) unstable; urgency=low
 
   * Updates to SNMP link state trap
-- 
cgit v1.2.3