Merge "Spiff up the upload_image() format handling"

2012-09-24 20:33:37 +00:00 · 2012-09-24 20:33:37 +00:00 · 219b12c52b
commit 219b12c52b
parent 8ca43bacc4 636a3ff429
1 changed files with 6 additions and 1 deletions
--- a/7
+++ b/7
@ -792,7 +792,12 @@ function upload_image() {
        *.img)
            IMAGE="$FILES/$IMAGE_FNAME";
            IMAGE_NAME=$(basename "$IMAGE" ".img")
-            DISK_FORMAT=raw
+            format=$(qemu-img info ${IMAGE} | awk '/^file format/ { print $3; exit }')
+            if [[ ",qcow2,raw,vdi,vmdk,vpc," =~ ",$format," ]]; then
+                DISK_FORMAT=$format
+            else
+                DISK_FORMAT=raw
+            fi
            CONTAINER_FORMAT=bare
            ;;
        *.img.gz)