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

don't need this in a loop

This commit is contained in:
Megan Marsh 2017-11-09 11:49:12 -08:00
parent b52ba4557e
commit d71bc34dfc
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
provisioner/windows-restart/provisioner.go
View File

@ -175,6 +175,13 @@ WaitLoop:
var waitForCommunicator = func(p *Provisioner) error {
runCustomRestartCheck := true
if p.config.RestartCheckCommand == DefaultRestartCheckCommand {
runCustomRestartCheck = false
}
// this is the user configurable command
cmdRestartCheck := &packer.RemoteCmd{Command: p.config.RestartCheckCommand}
log.Printf("Checking that communicator is connected with: '%s'",
cmdRestartCheck.Command)
for {
select {
case <-p.cancel:
@ -183,16 +190,8 @@ var waitForCommunicator = func(p *Provisioner) error {
case <-time.After(retryableSleep):
}
if runCustomRestartCheck == true {
if p.config.RestartCheckCommand == DefaultRestartCheckCommand {
runCustomRestartCheck = false
}
// this is the user configurable command
cmdRestartCheck := &packer.RemoteCmd{Command: p.config.RestartCheckCommand}
log.Printf("Checking that communicator is connected with: '%s'",
cmdRestartCheck.Command)
// run user-configured restart check
err := cmdRestartCheck.StartWithUi(p.comm, p.ui)
if err != nil {
log.Printf("Communication connection err: %s", err)
continue