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

Add param documentation and fix key used for box version

This commit is contained in:
Chris Roberts 2018-08-02 15:19:39 -07:00
parent 6c1a9dc58e
commit 03d8965ef7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant/vagrantfile.rb
View File

@ -107,6 +107,7 @@ module Vagrant
# be backed by (required for provider overrides). # be backed by (required for provider overrides).
# @param [BoxCollection] boxes BoxCollection to look up the # @param [BoxCollection] boxes BoxCollection to look up the
# box Vagrantfile. # box Vagrantfile.
# @param [Pathname] data_path Machine data path
# @return [Hash<Symbol, Object>] Various configuration parameters for a # @return [Hash<Symbol, Object>] Various configuration parameters for a
# machine. See the main documentation body for more info. # machine. See the main documentation body for more info.
def machine_config(name, provider, boxes, data_path=nil) def machine_config(name, provider, boxes, data_path=nil)
@ -179,7 +180,7 @@ module Vagrant
if meta_file.file? if meta_file.file?
box_meta = JSON.parse(meta_file.read) box_meta = JSON.parse(meta_file.read)
config.vm.box = box_meta["name"] config.vm.box = box_meta["name"]
config.vm.box_version = box_meta["box_version"] config.vm.box_version = box_meta["version"]
end end
end end