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

Allow a MAC address to be specified for bridges

This commit is contained in:
Mitchell Hashimoto 2011-12-31 19:13:02 -08:00
parent c48a31d6bd
commit 567c09df21
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,10 @@ module Vagrant
if type == :bridged if type == :bridged
options = args[0] || {} options = args[0] || {}
results << { :adapter => 2 }.merge(options) results << {
:adapter => 2,
:mac => nil
}.merge(options)
end end
end end
@ -84,9 +87,10 @@ module Vagrant
networks.each do |options| networks.each do |options|
adapters << { adapters << {
:adapter => options[:adapter] + 1, :adapter => options[:adapter] + 1,
:type => :bridged, :type => :bridged,
:bridge => options[:bridge] :bridge => options[:bridge],
:mac_address => options[:mac]
} }
end end