From 784535a4e32bd93c229081f3c86da315834777ac Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Thu, 22 Nov 2018 20:19:00 -0600 Subject: [PATCH] Updated things related to the parallels-iso builder to correspond to @azr's suggestions. --- builder/parallels/common/hw_config.go | 4 +--- website/source/docs/builders/parallels-iso.html.md.erb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/builder/parallels/common/hw_config.go b/builder/parallels/common/hw_config.go index 85f6d58b5..bc51c97a6 100644 --- a/builder/parallels/common/hw_config.go +++ b/builder/parallels/common/hw_config.go @@ -23,7 +23,6 @@ func (c *HWConfig) Prepare(ctx *interpolate.Context) []error { // Hardware and cpu options if c.CpuCount < 0 { errs = append(errs, fmt.Errorf("An invalid number of cpus was specified (cpus < 0): %d", c.CpuCount)) - c.CpuCount = 0 } if c.CpuCount == 0 { c.CpuCount = 1 @@ -31,7 +30,6 @@ func (c *HWConfig) Prepare(ctx *interpolate.Context) []error { if c.MemorySize < 0 { errs = append(errs, fmt.Errorf("An invalid memory size was specified (memory < 0): %d", c.MemorySize)) - c.MemorySize = 0 } if c.MemorySize == 0 { c.MemorySize = 512 @@ -46,5 +44,5 @@ func (c *HWConfig) Prepare(ctx *interpolate.Context) []error { c.USB = false } - return nil + return errs } diff --git a/website/source/docs/builders/parallels-iso.html.md.erb b/website/source/docs/builders/parallels-iso.html.md.erb index e66e4b7bf..0a109efe3 100644 --- a/website/source/docs/builders/parallels-iso.html.md.erb +++ b/website/source/docs/builders/parallels-iso.html.md.erb @@ -103,7 +103,7 @@ builder. specified, the default is 10 seconds. - `cpus` (number) - The number of cpus to use for building the VM. - Defaults to building with just one. + Defaults to `1`. - `disk_size` (number) - The size, in megabytes, of the hard disk to create for the VM. By default, this is 40000 (about 40 GB).