github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 11:00:25 +00:00
Code Issues Projects Releases Wiki Activity

tools: Fix guestfs invocation (vmdk and dynamic-vhd)

Browse Source 
Looks like bc791e60e7 ("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>
This commit is contained in:
Rolf Neugebauer 2018-01-25 17:56:12 +00:00
parent dd73698b77
commit c582907b19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mkimage-dynamic-vhd/make-dynamic-vhd
View File

@ -40,7 +40,7 @@ cd ..
tar cf files.tar -C files . tar cf files.tar -C files .
# Disk is created in qcow format. # 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 guestfish -a disk.qcow -m /dev/sda1 <<EOF
upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin

2
tools/mkimage-vmdk/make-vmdk
View File

@ -40,7 +40,7 @@ cd ..
tar cf files.tar -C files . tar cf files.tar -C files .
# Disk is created in qcow format, testing needed to see if raw->vmdk conversion makes any efficency gains # 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 guestfish -a disk.qcow -m /dev/sda1 <<EOF
upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin