diff --git a/CHANGELOG.md b/CHANGELOG.md index c8a0fc186..e3b43423e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ BUG FIXES: written to the FAT12 filesystem. [GH-285] * builder/vmware: dowload progress won't be shown until download actually starts. [GH-288] +* builder/vmware: interrupt works while typing commands over VNC. * builder/virtualbox: floppy files names of 13 characters are now properly written to the FAT12 filesystem. [GH-285] * post-processor/vagrant: Process user variables. [GH-295] diff --git a/builder/vmware/step_type_boot_command.go b/builder/vmware/step_type_boot_command.go index e3f971f05..2bc831913 100644 --- a/builder/vmware/step_type_boot_command.go +++ b/builder/vmware/step_type_boot_command.go @@ -96,6 +96,12 @@ func (s *stepTypeBootCommand) Run(state map[string]interface{}) multistep.StepAc return multistep.ActionHalt } + // Check for interrupts between typing things so we can cancel + // since this isn't the fastest thing. + if _, ok := state[multistep.StateCancelled]; ok { + return multistep.ActionHalt + } + vncSendString(c, command) }