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

Default host only adapters to #1 again

This commit is contained in:
Mitchell Hashimoto 2011-12-31 00:55:37 -08:00
parent 77b915f06a
commit f7125b1dd7
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vagrant/action/vm/network.rb
View File

@ -56,7 +56,7 @@ module Vagrant
results << { results << {
:ip => ip, :ip => ip,
:netmask => "255.255.255.0", :netmask => "255.255.255.0",
:adapter => nil, :adapter => 1,
:mac => nil, :mac => nil,
:name => nil :name => nil
}.merge(options) }.merge(options)
@ -107,16 +107,8 @@ module Vagrant
@logger.debug("Created network: #{interface[:name]}") @logger.debug("Created network: #{interface[:name]}")
end end
# Now that we have an interface, we need to figure out an adapter to
# enable this on, if it wasn't explicitly given.
adapter = network_options[:adapter]
if !adapter
# TODO: Automatically determine adapter
adapter = 1
end
adapters << { adapters << {
:adapter => adapter + 1, :adapter => network_options[:adapter] + 1,
:type => :hostonly, :type => :hostonly,
:hostonly => interface[:name], :hostonly => interface[:name],
:mac_address => network_options[:mac] :mac_address => network_options[:mac]