iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7509 from hashicorp/investigate_7505 

fix panic in StepConfigureVNC ( fix 7505 )
This commit is contained in:
Megan Marsh 2019-04-16 11:24:55 -07:00 committed by GitHub
parent 592b2aab6d 56c7593725
commit 8315be7e19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/vmware/common/step_configure_vnc.go
View File

@ -106,7 +106,7 @@ func (s *StepConfigureVNC) Run(ctx context.Context, state multistep.StateBag) mu
vncPassword := VNCPassword(s.VNCDisablePassword) vncPassword := VNCPassword(s.VNCDisablePassword)
log.Printf("Found available VNC port: %v", s.l) log.Printf("Found available VNC port: %s:%d", vncBindAddress, vncPort)
vncFinder.UpdateVMX(vncBindAddress, vncPassword, vncPort, vmxData) vncFinder.UpdateVMX(vncBindAddress, vncPassword, vncPort, vmxData)
@ -117,8 +117,8 @@ func (s *StepConfigureVNC) Run(ctx context.Context, state multistep.StateBag) mu
return multistep.ActionHalt return multistep.ActionHalt
} }
state.Put("vnc_port", s.l.Port) state.Put("vnc_port", vncPort)
state.Put("vnc_ip", s.l.Address) state.Put("vnc_ip", vncBindAddress)
state.Put("vnc_password", vncPassword) state.Put("vnc_password", vncPassword)
return multistep.ActionContinue return multistep.ActionContinue