lxc-ubuntu-cloud: extract the right filenames from tarball

Signed-off-by: Ben Howard <ben.howard@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 29d1bea5f3154238bbe9a3d72dfefb99e6c01088..d215e158dd36dc438ddc83bd51a39f4e8f33b667 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -270,7 +270,7 @@ build_root_tgz()
 
     xdir=`mktemp -d -p .`
     tarname=`basename $url`
-    imgname="`basename $tarname .tar.gz`.img"
+    imgname="$release-*-cloudimg-$arch.img"
     trap buildcleanup EXIT
     if [ $flushcache -eq 1 -o ! -f $cache/$tarname ]; then
         rm -f $tarname
@@ -278,7 +278,7 @@ build_root_tgz()
         wget $url || { echo "Couldn't find cloud image $url."; exit 1; }
     fi
     echo "Creating new cached cloud image rootfs"
-    tar zxf $tarname $imgname
+    tar --wildcards -zxf $tarname $imgname
     mount -o loop $imgname $xdir
     (cd $xdir; tar zcf ../$filename .)
     umount $xdir