From 07b013945f1ac80a7fd7813cd0d42d188518d400 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 12 Oct 2017 16:38:18 -0700 Subject: [PATCH] more consistent flag name --- builder/vmware/common/step_clean_vmx.go | 4 ++-- builder/vmware/iso/builder.go | 2 +- builder/vmware/vmx/builder.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go index 59f370aff..853233e89 100644 --- a/builder/vmware/common/step_clean_vmx.go +++ b/builder/vmware/common/step_clean_vmx.go @@ -21,7 +21,7 @@ import ( // type StepCleanVMX struct { RemoveEthernetInterfaces bool - SkipVNCDisable bool + VNCEnabled bool } func (s StepCleanVMX) Run(state multistep.StateBag) multistep.StepAction { @@ -60,7 +60,7 @@ func (s StepCleanVMX) Run(state multistep.StateBag) multistep.StepAction { vmxData[ide+"clientdevice"] = "TRUE" } - if !s.SkipVNCDisable { + if s.VNCEnabled { ui.Message("Disabling VNC server...") vmxData["remotedisplay.vnc.enabled"] = "FALSE" } diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index c772d17a2..44db307a7 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -311,7 +311,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe }, &vmwcommon.StepCleanVMX{ RemoveEthernetInterfaces: b.config.VMXConfig.VMXRemoveEthernet, - SkipVNCDisable: b.config.DisableVNC, + VNCEnabled: !b.config.DisableVNC, }, &StepUploadVMX{ RemoteType: b.config.RemoteType, diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index ef2e4cc86..b7c70d548 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -123,7 +123,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe }, &vmwcommon.StepCleanVMX{ RemoveEthernetInterfaces: b.config.VMXConfig.VMXRemoveEthernet, - SkipVNCDisable: b.config.DisableVNC, + VNCEnabled: !b.config.DisableVNC, }, }