upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-06-09 08:42:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #4810 from bryonr/fix_vmware_shutdown_cleanup_osx

Browse source 
Help ensure VMX builder properly removes mounted CDs on OS X
This commit is contained in:
Matthew Hooker 2017-06-05 15:17:08 -07:00 committed by GitHub
commit bf830e393d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
builder/vmware/common/step_shutdown.go
View file

@ -8,7 +8,6 @@ import (
"github.com/mitchellh/multistep"
"log"
"regexp"
"runtime"
"strings"
"time"
)
@ -125,10 +124,10 @@ LockWaitLoop:
}
}
if runtime.GOOS != "darwin" && !s.Testing {
if !s.Testing {
// Windows takes a while to yield control of the files when the
// process is exiting. Ubuntu will yield control of the files but
// VMWare may overwrite the VMX cleanup steps that run after this,
// process is exiting. Ubuntu and OS X will yield control of the files
// but VMWare may overwrite the VMX cleanup steps that run after this,
// so we wait to ensure VMWare has exited and flushed the VMX.
// We just sleep here. In the future, it'd be nice to find a better