Merge pull request #7071 from aspectcapital/ignore-pending-reboots

Ignore an already-scheduled reboot
7 years ago · 2283efff79
parent ce71932f95 0192289d68
commit 2283efff79
1 changed files with 1 additions and 1 deletions
--- a/provisioner/windows-restart/provisioner.go
+++ b/provisioner/windows-restart/provisioner.go
@ -96,7 +96,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
 		return err
 	}

-	if cmd.ExitStatus != 0 {
+	if cmd.ExitStatus != 0 && cmd.ExitStatus != 1115 && cmd.ExitStatus != 1190 {
 		return fmt.Errorf("Restart script exited with non-zero exit status: %d", cmd.ExitStatus)
 	}