iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #681 from pcfens/qemu-img-formats 

builder/qemu: qemu format img is invalid
This commit is contained in:
Mitchell Hashimoto 2013-12-06 17:55:32 -08:00
parent 470f8361ad c4ae11589d
commit e1042cbc2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/qemu/builder.go
View File

@ -217,7 +217,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
if !(b.config.Format == "qcow2" || b.config.Format == "raw") {
errs = packer.MultiErrorAppend(
errs, errors.New("invalid format, only 'qcow2' or 'img' are allowed"))
errs, errors.New("invalid format, only 'qcow2' or 'raw' are allowed"))
}
if !(b.config.Accelerator == "kvm" || b.config.Accelerator == "xen") {

2
website/source/docs/builders/qemu.html.markdown
View File

@ -115,7 +115,7 @@ Optional:
commands or kickstart type scripts must have proper adjustments for
resulting device names. The Qemu builder uses "virtio" by default.
* `format` (string) - Either "qcow2" or "img", this specifies the output
* `format` (string) - Either "qcow2" or "raw", this specifies the output
format of the virtual machine image. This defaults to "qcow2".
* `headless` (bool) - Packer defaults to building virtual machines by