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

Changed error message and docs to match code - qemu-img options are qcow2 and raw

This commit is contained in:
Phil Fenstermacher 2013-12-04 14:05:07 -05:00
parent 23c13e29b1
commit 43bf7b2859
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") { if !(b.config.Format == "qcow2" || b.config.Format == "raw") {
errs = packer.MultiErrorAppend( 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") { 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 commands or kickstart type scripts must have proper adjustments for
resulting device names. The Qemu builder uses "virtio" by default. 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". format of the virtual machine image. This defaults to "qcow2".
* `headless` (bool) - Packer defaults to building virtual machines by * `headless` (bool) - Packer defaults to building virtual machines by