Skip to content

Commit

Permalink
Forward-port fix for OS X and VirtualBox bug from 1-0-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellh committed Nov 20, 2012
1 parent b416665 commit 42f1571
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions plugins/providers/virtualbox/driver/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,24 @@ def raw(*command, &block)
# Append in the options for subprocess
command << { :notify => [:stdout, :stderr] }

# The following is a workaround for a combined VirtualBox and
# Mac OS X 10.8 bug:
#
# Remove the DYLD_LIBRARY_PATH environmental variable on Mac. This
# is to fix a bug in Mac OS X 10.8 where a warning is printed to the
# console if this is set when executing certain programs, which
# can cause some VBoxManage commands to break because they work
# by just reading stdout and don't expect the OS to just inject
# garbage into it.
old_dyld_lib_path = ENV.delete("DYLD_LIBRARY_PATH")

Vagrant::Util::Busy.busy(int_callback) do
Vagrant::Util::Subprocess.execute(@vboxmanage_path, *command, &block)
end
ensure
# Reset the library path if it was set before. See above comments
# for more information on why this was unset in the first place.
ENV["DYLD_LIBRARY_PATH"] = old_dyld_lib_path if old_dyld_lib_path
end
end
end
Expand Down

0 comments on commit 42f1571

Please sign in to comment.