From 5fed453047fd6dfe2f145e6044de691ed2ce0803 Mon Sep 17 00:00:00 2001 From: Matt Dainty Date: Wed, 5 Dec 2018 15:43:22 +0000 Subject: [PATCH 1/2] Ignore an already-scheduled reboot If the previous provisioner already scheduled a reboot don't error we can't schedule another one. --- provisioner/windows-restart/provisioner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index 2e9615b17..394d3f3d0 100644 --- 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 && cmd.ExitStatus != 1717 { return fmt.Errorf("Restart script exited with non-zero exit status: %d", cmd.ExitStatus) } From 0192289d688c87c0711d351fd2dc8a2fab23a868 Mon Sep 17 00:00:00 2001 From: Matt Dainty Date: Fri, 7 Dec 2018 09:45:50 +0000 Subject: [PATCH 2/2] Drop exit code 1717 --- provisioner/windows-restart/provisioner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index 394d3f3d0..126a0dd52 100644 --- 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 && cmd.ExitStatus != 1115 && cmd.ExitStatus != 1190 && cmd.ExitStatus != 1717 { + if cmd.ExitStatus != 0 && cmd.ExitStatus != 1115 && cmd.ExitStatus != 1190 { return fmt.Errorf("Restart script exited with non-zero exit status: %d", cmd.ExitStatus) }