github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-05 03:15:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1944 from justincormack/qemu-multiple-disks

Browse Source 
Support multiple disks in qemu
This commit is contained in:
Justin Cormack
2017-06-01 14:17:51 +01:00
committed by GitHub
parent abb19f847d 25a1e12cf3
commit 583c5755fa
7 changed files with 166 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/cases/010_platforms/000_qemu/030_run_qcow/test.sh
View File

@@ -19,5 +19,5 @@ trap clean_up EXIT
moby build -output qcow2 -name "${NAME}" test.yml
[ -f "${NAME}.qcow2" ] || exit 1
linuxkit run qemu -disk-format qcow2 "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
linuxkit run qemu "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
exit 0

2
test/cases/040_packages/013_mkimage/test.sh
View File

@@ -19,7 +19,7 @@ trap clean_up EXIT
# Test code goes here
moby build -output kernel+initrd run.yml
moby build -output kernel+initrd mkimage.yml
linuxkit run qemu -disk-size 200 -disk-format qcow2 -disk disk.qcow2 -kernel mkimage
linuxkit run qemu -disk disk.qcow2,size=200M,format=qcow2 -kernel mkimage
linuxkit run qemu disk.qcow2
exit 0