From c4ae11589dd05a8c85c4a6a041fd2ff87acba548 Mon Sep 17 00:00:00 2001 From: Phil Fenstermacher Date: Wed, 4 Dec 2013 14:05:07 -0500 Subject: [PATCH] Changed error message and docs to match code - qemu-img options are qcow2 and raw --- builder/qemu/builder.go | 2 +- website/source/docs/builders/qemu.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index 83169f38e..065b2436a 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -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") { diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index cfcd2601e..96f06b9cf 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -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