diff -Nru cloud-utils-0.25/debian/changelog cloud-utils-0.25/debian/changelog --- cloud-utils-0.25/debian/changelog 2012-02-28 19:40:54.000000000 +0000 +++ cloud-utils-0.25/debian/changelog 2012-03-09 22:04:57.000000000 +0000 @@ -1,3 +1,12 @@ +cloud-utils (0.25-0ubuntu5) precise; urgency=low + + * cloud-publish-tarball, cloud-publish-image: be more quiet + when downloading images by using wget --progress=dot:mega + * ubuntu-cloudimg-query, ubuntu-ec2-run: support m1.medium ec2 size + and do not assume m1.small or c1.medium imply i386. + + -- Scott Moser Fri, 09 Mar 2012 17:02:53 -0500 + cloud-utils (0.25-0ubuntu4) precise; urgency=low * growpart: invoke sfdisk with '--no-reread' to avoid udev race diff -Nru cloud-utils-0.25/debian/patches/downloading-wget-use-dot-mega.patch cloud-utils-0.25/debian/patches/downloading-wget-use-dot-mega.patch --- cloud-utils-0.25/debian/patches/downloading-wget-use-dot-mega.patch 1970-01-01 00:00:00.000000000 +0000 +++ cloud-utils-0.25/debian/patches/downloading-wget-use-dot-mega.patch 2012-03-09 22:02:37.000000000 +0000 @@ -0,0 +1,37 @@ +------------------------------------------------------------ +revno: 176 +committer: Scott Moser +branch nick: trunk +timestamp: Fri 2012-03-02 09:30:59 -0500 +message: + when downloading images use wget's dot:mega + + for large image downloading it just makes sense to put less + dots on the screen. This makes the 'dl' function in + cloud-publish-image and cloud-publish-tarball be more quiet. +=== modified file 'bin/cloud-publish-image' +--- old/bin/cloud-publish-image 2012-02-28 19:02:25 +0000 ++++ new/bin/cloud-publish-image 2012-03-02 14:30:59 +0000 +@@ -156,7 +156,7 @@ + local qflag="-q" + [ "$quiet" = "0" ] && qflag="" + +- wget $qflag "$url" -O "$target" || ++ wget $qflag --progress=dot:mega "$url" -O "$target" || + return 1 + } + + +=== modified file 'bin/cloud-publish-tarball' +--- old/bin/cloud-publish-tarball 2012-02-28 19:02:25 +0000 ++++ new/bin/cloud-publish-tarball 2012-03-02 14:30:59 +0000 +@@ -88,7 +88,7 @@ + local qflag="-q" + [ "$quiet" = "0" ] && qflag="" + +- wget $qflag "$url" -O "$target" || ++ wget $qflag --progress=dot:mega "$url" -O "$target" || + return 1 + } + + diff -Nru cloud-utils-0.25/debian/patches/series cloud-utils-0.25/debian/patches/series --- cloud-utils-0.25/debian/patches/series 2012-02-28 19:39:22.000000000 +0000 +++ cloud-utils-0.25/debian/patches/series 2012-03-09 22:02:41.000000000 +0000 @@ -1,3 +1,5 @@ fix-publish-image-ramdisk-none.patch growpart-show-sfdisk-error-output.patch growpart-use-sfdisk-no-reread.patch +downloading-wget-use-dot-mega.patch +support-m1-medium-and-x86_64-everywhere.patch diff -Nru cloud-utils-0.25/debian/patches/support-m1-medium-and-x86_64-everywhere.patch cloud-utils-0.25/debian/patches/support-m1-medium-and-x86_64-everywhere.patch --- cloud-utils-0.25/debian/patches/support-m1-medium-and-x86_64-everywhere.patch 1970-01-01 00:00:00.000000000 +0000 +++ cloud-utils-0.25/debian/patches/support-m1-medium-and-x86_64-everywhere.patch 2012-03-09 22:02:37.000000000 +0000 @@ -0,0 +1,47 @@ +------------------------------------------------------------ +revno: 177 +committer: Scott Moser +branch nick: trunk +timestamp: Fri 2012-03-09 09:27:58 -0500 +message: + update for "x86_64 on all sizes" and new size m1.medium + + This just removes code that insisted m1.small and c1.medium were + i386 only, and adds the new m1.medium type. +=== modified file 'bin/ubuntu-cloudimg-query' +--- old/bin/ubuntu-cloudimg-query 2012-02-28 19:02:25 +0000 ++++ new/bin/ubuntu-cloudimg-query 2012-03-09 14:27:58 +0000 +@@ -178,9 +178,7 @@ + [a-z][1-9].[0-9a-z]*|c[cg][1-9].*) + itype="$i"; + case "${i}" in +- t1.micro) store=ebs;; # t1.micro does not imply arch +- m1.small|c1.medium) arch=i386;; +- *) arch=amd64;; ++ t1.micro) store=ebs;; # t1.micro only supports ebs + esac + ;; + http://*|https://*) burl=${i};; + +=== modified file 'bin/ubuntu-ec2-run' +--- old/bin/ubuntu-ec2-run 2012-02-28 19:00:39 +0000 ++++ new/bin/ubuntu-ec2-run 2012-03-09 14:27:58 +0000 +@@ -95,13 +95,13 @@ + # cleaned from http://aws.amazon.com/ec2/instance-types/ + # t1.micro NONE # m2.2xlarge 850 # c1.xlarge 1690 + # m1.small 160 # m1.large 850 # m1.xlarge 1690 +- # c1.medium 350 # cc1.4xlarge 1690 # cc1.4xlarge 1690 +- # m2.xlarge 420 # m2.4xlarge 1690 # cg1.4xlarge 1690 +- # # cc2.8xlarge 3370 ++ # m1.medium 410 # cc1.4xlarge 1690 # cc1.4xlarge 1690 ++ # c1.medium 350 # m2.4xlarge 1690 # cg1.4xlarge 1690 ++ # m2.xlarge 420 # cc2.8xlarge 3370 + bdmaps = [ ] + if itype in ("t1.micro", "m1.small", "c1.medium"): + pass # the first one is always attached. ephemeral0=sda2 +- elif itype in ("m2.xlarge"): ++ elif itype in ("m2.xlarge", "m1.medium"): + pass # one 420 for m2.xlarge + elif ( itype in ("m1.large", "m2.2xlarge") or + itype.startswith("cg1.") or itype.startswith("cc1.")): +