kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER

Browse source 
Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
This commit is contained in:
Daniel Mizyrycki 2013-09-03 17:38:03 -07:00
commit a0a5170991
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Vagrantfile vendored
View file

@ -24,7 +24,8 @@ Vagrant::Config.run do |config|
pkg_cmd << "apt-get update -qq; apt-get install -q -y linux-image-generic-lts-raring; " pkg_cmd << "apt-get update -qq; apt-get install -q -y linux-image-generic-lts-raring; "
# Add guest additions if local vbox VM # Add guest additions if local vbox VM
is_vbox = true is_vbox = true
ARGV.each do |arg| is_vbox &&= !arg.downcase.start_with?("--provider") end # The logic here makes a few assumptions (i.e. no one uses --provider=virtualbox)
ARGV.each do |arg| is_vbox &&= ( !arg.downcase.start_with?("--provider") && !ENV['VAGRANT_DEFAULT_PROVIDER'] )end
if is_vbox if is_vbox
pkg_cmd << "apt-get install -q -y linux-headers-generic-lts-raring dkms; " \ pkg_cmd << "apt-get install -q -y linux-headers-generic-lts-raring dkms; " \
"echo 'Downloading VBox Guest Additions...'; " \ "echo 'Downloading VBox Guest Additions...'; " \