Commit d9fceaf3 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

update CHANGELOG

parent 25533336
...@@ -118,6 +118,7 @@ BUG FIXES: ...@@ -118,6 +118,7 @@ BUG FIXES:
to retrieve the SSH IP from. [GH-2220] to retrieve the SSH IP from. [GH-2220]
* builder/qemu: Add `disk_discard` option [GH-2120] * builder/qemu: Add `disk_discard` option [GH-2120]
* builder/qemu: Use proper SSH port, not hardcoded to 22. [GH-2236] * builder/qemu: Use proper SSH port, not hardcoded to 22. [GH-2236]
* builder/qemu: Find unused SSH port if SSH port is taken. [GH-2032]
* builder/virtualbox: Bind HTTP server to IPv4, which is more compatible with * builder/virtualbox: Bind HTTP server to IPv4, which is more compatible with
OS installers. [GH-1709] OS installers. [GH-1709]
* builder/virtualbox: Remove the floppy controller in addition to the * builder/virtualbox: Remove the floppy controller in addition to the
...@@ -126,6 +127,7 @@ BUG FIXES: ...@@ -126,6 +127,7 @@ BUG FIXES:
".iso" extension didn't work. [GH-1839] ".iso" extension didn't work. [GH-1839]
* builder/virtualbox: Output dir is verified at runtime, not template * builder/virtualbox: Output dir is verified at runtime, not template
validation time. [GH-2233] validation time. [GH-2233]
* builder/virtualbox: Find unused SSH port if SSH port is taken. [GH-2032]
* builder/vmware: Add 100ms delay between keystrokes to avoid subtle * builder/vmware: Add 100ms delay between keystrokes to avoid subtle
timing issues in most cases. [GH-1663] timing issues in most cases. [GH-1663]
* builder/vmware: Bind HTTP server to IPv4, which is more compatible with * builder/vmware: Bind HTTP server to IPv4, which is more compatible with
......
...@@ -46,10 +46,10 @@ func (s *StepForwardSSH) Run(state multistep.StateBag) multistep.StepAction { ...@@ -46,10 +46,10 @@ func (s *StepForwardSSH) Run(state multistep.StateBag) multistep.StepAction {
} }
for { for {
sshHostPort = offset + s.HostPortMin sshHostPort = offset + int(s.HostPortMin)
if sshHostPort >= s.HostPortMax { if sshHostPort >= int(s.HostPortMax) {
offset = 0 offset = 0
sshHostPort = s.HostPortMin sshHostPort = int(s.HostPortMin)
} }
log.Printf("Trying port: %d", sshHostPort) log.Printf("Trying port: %d", sshHostPort)
l, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", sshHostPort)) l, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", sshHostPort))
......
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