haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a option to ignore the vagrantfile packaged with the box

This commit is contained in:
Alex Wu 2017-01-10 13:06:12 +08:00 committed by Brian Cain
parent 0699323da2
commit 282c7341c9
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/kernel_v2/config/vm.rb
View File

@ -22,6 +22,7 @@ module VagrantPlugins
attr_accessor :base_mac attr_accessor :base_mac
attr_accessor :boot_timeout attr_accessor :boot_timeout
attr_accessor :box attr_accessor :box
attr_accessor :box_ignore_box_vagrantfile
attr_accessor :box_check_update attr_accessor :box_check_update
attr_accessor :box_url attr_accessor :box_url
attr_accessor :box_server_url attr_accessor :box_server_url
@ -51,6 +52,7 @@ module VagrantPlugins
@base_mac = UNSET_VALUE @base_mac = UNSET_VALUE
@boot_timeout = UNSET_VALUE @boot_timeout = UNSET_VALUE
@box = UNSET_VALUE @box = UNSET_VALUE
@box_ignore_box_vagrantfile = UNSET_VALUE
@box_check_update = UNSET_VALUE @box_check_update = UNSET_VALUE
@box_download_ca_cert = UNSET_VALUE @box_download_ca_cert = UNSET_VALUE
@box_download_ca_path = UNSET_VALUE @box_download_ca_path = UNSET_VALUE
@ -378,6 +380,8 @@ module VagrantPlugins
@boot_timeout = 300 if @boot_timeout == UNSET_VALUE @boot_timeout = 300 if @boot_timeout == UNSET_VALUE
@box = nil if @box == UNSET_VALUE @box = nil if @box == UNSET_VALUE
@box_ignore_box_vagrantfile = false if @box_ignore_box_vagrantfile == UNSET_VALUE
if @box_check_update == UNSET_VALUE if @box_check_update == UNSET_VALUE
@box_check_update = !present?(ENV["VAGRANT_BOX_UPDATE_CHECK_DISABLE"]) @box_check_update = !present?(ENV["VAGRANT_BOX_UPDATE_CHECK_DISABLE"])
end end