From c582907b191f88d2084ca7fafbd460e720bb39c4 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Thu, 25 Jan 2018 17:56:12 +0000
Subject: [PATCH] tools: Fix guestfs invocation (vmdk and dynamic-vhd)

Looks like bc791e60e78c ("Update docs and test cases to work with
latest format versions") accidentally replaced 'qcow2' with
'qcow2-bios' for two of the output formats. Fix it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/mkimage-dynamic-vhd/make-dynamic-vhd | 2 +-
 tools/mkimage-vmdk/make-vmdk               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mkimage-dynamic-vhd/make-dynamic-vhd b/tools/mkimage-dynamic-vhd/make-dynamic-vhd
index c7675c67f..5115cb8ff 100755
--- a/tools/mkimage-dynamic-vhd/make-dynamic-vhd
+++ b/tools/mkimage-dynamic-vhd/make-dynamic-vhd
@@ -40,7 +40,7 @@ cd ..
 tar cf files.tar -C files .
 
 # Disk is created in qcow format.
-virt-make-fs --size=25G --type=ext4 --partition files.tar --format=qcow2-bios disk.qcow
+virt-make-fs --size=25G --type=ext4 --partition files.tar --format=qcow2 disk.qcow
 
 guestfish -a disk.qcow -m /dev/sda1 <<EOF
   upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin
diff --git a/tools/mkimage-vmdk/make-vmdk b/tools/mkimage-vmdk/make-vmdk
index 7c7600738..16fe99aa6 100755
--- a/tools/mkimage-vmdk/make-vmdk
+++ b/tools/mkimage-vmdk/make-vmdk
@@ -40,7 +40,7 @@ cd ..
 tar cf files.tar -C files .
 
 # Disk is created in qcow format, testing needed to see if raw->vmdk conversion makes any efficency gains
-virt-make-fs --size=1G --type=ext4 --partition files.tar --format=qcow2-bios disk.qcow
+virt-make-fs --size=1G --type=ext4 --partition files.tar --format=qcow2 disk.qcow
 
 guestfish -a disk.qcow -m /dev/sda1 <<EOF
   upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin