Merge pull request #174 from rancher-sandbox/qemu-6.1

AkihiroSuda · web-flow · commit a2045a1520a5 · 2021-08-28T15:08:16.000+09:00
qemu-img 6.1.0 no longer supports using -b without -F
diff --git a/pkg/qemu/qemu.go b/pkg/qemu/qemu.go
@@ -78,7 +78,7 @@ func EnsureDisk(cfg Config) error {
 	}
 	args := []string{"create", "-f", "qcow2"}
 	if !isBaseDiskISO {
-		args = append(args, "-b", baseDisk)
+		args = append(args, "-F", "qcow2", "-b", baseDisk)
 	}
 	args = append(args, diffDisk, strconv.Itoa(int(diskSize)))
 	cmd := exec.Command("qemu-img", args...)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func EnsureDisk(cfg Config) error {`
`78`	`78`	`}`
`79`	`79`	`args := []string{"create", "-f", "qcow2"}`
`80`	`80`	`if !isBaseDiskISO {`
`81`		`- args = append(args, "-b", baseDisk)`
	`81`	`+ args = append(args, "-F", "qcow2", "-b", baseDisk)`
`82`	`82`	`}`
`83`	`83`	`args = append(args, diffDisk, strconv.Itoa(int(diskSize)))`
`84`	`84`	`cmd := exec.Command("qemu-img", args...)`