X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Fbuild.sh;h=6b1254661d0eabaa54842f3ee5062577afc7266f;hb=refs%2Fchanges%2F72%2F3772%2F5;hp=33634adf02df6dde9d9c375eddeed12c6fceb0a2;hpb=025d95939e2c14658204b307420fc75656a90ca7;p=csit.git

diff --git a/resources/tools/disk-image-builder/ubuntu/build.sh b/resources/tools/disk-image-builder/ubuntu/build.sh
index 33634adf02..6b1254661d 100755
--- a/resources/tools/disk-image-builder/ubuntu/build.sh
+++ b/resources/tools/disk-image-builder/ubuntu/build.sh
@@ -83,7 +83,7 @@ PACKER_DIR="${BUILD_DIR}/packer"
 APT_CACHE_DIR="${BUILD_DIR}/cache/apt"
 PIP_CACHE_DIR="${BUILD_DIR}/cache/pip"
 
-PACKER_TEMPLATE="ubuntu-14.04.4.json"
+PACKER_TEMPLATE="$1.json"
 LISTS_DIR="$(dirname $0)/lists"
 
 function syntax {
@@ -209,7 +209,8 @@ do
     then
       echo "WARNING: Unable to get package using previously recorded URL, may"
       echo "         be superseded. Trying launchpad instead."
-      wget -P ${APT_CACHE_DIR} -O ${APT_CACHE_DIR}/$name "${LAUNCHPAD_URL}${name}"
+      url_basename=$(basename $url | tr -d "'")
+      wget -P ${APT_CACHE_DIR} -O ${APT_CACHE_DIR}/$name "${LAUNCHPAD_URL}${url_basename}"
     fi
   fi