Commit 3fc069c4 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/vmware: interrupts work during VNC type on VMware

parent b49fe497
...@@ -38,6 +38,7 @@ BUG FIXES: ...@@ -38,6 +38,7 @@ BUG FIXES:
written to the FAT12 filesystem. [GH-285] written to the FAT12 filesystem. [GH-285]
* builder/vmware: dowload progress won't be shown until download * builder/vmware: dowload progress won't be shown until download
actually starts. [GH-288] actually starts. [GH-288]
* builder/vmware: interrupt works while typing commands over VNC.
* builder/virtualbox: floppy files names of 13 characters are now properly * builder/virtualbox: floppy files names of 13 characters are now properly
written to the FAT12 filesystem. [GH-285] written to the FAT12 filesystem. [GH-285]
* post-processor/vagrant: Process user variables. [GH-295] * post-processor/vagrant: Process user variables. [GH-295]
......
...@@ -96,6 +96,12 @@ func (s *stepTypeBootCommand) Run(state map[string]interface{}) multistep.StepAc ...@@ -96,6 +96,12 @@ func (s *stepTypeBootCommand) Run(state map[string]interface{}) multistep.StepAc
return multistep.ActionHalt 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) vncSendString(c, command)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment