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

Merge pull request #5691 from bergman/list-of-nics-to-bridge-to

This commit is contained in:
Seth Vargo 2015-05-30 12:02:17 -07:00
parent b5d7559025 08f240668b
commit 9dddcdb8de
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/providers/virtualbox/action/network.rb
View File

@ -157,14 +157,16 @@ module VagrantPlugins
@logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}") @logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}")
# Search for a matching bridged interface # Search for a matching bridged interface
bridge = config[:bridge] Array(config[:bridge]).each do |bridge|
bridge = bridge.downcase if bridge.respond_to?(:downcase) bridge = bridge.downcase if bridge.respond_to?(:downcase)
bridgedifs.each do |interface| bridgedifs.each do |interface|
if bridge === interface[:name].downcase if bridge === interface[:name].downcase
@logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.") @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
chosen_bridge = interface[:name] chosen_bridge = interface[:name]
break break
end
end end
break if chosen_bridge
end end
# If one wasn't found, then we notify the user here. # If one wasn't found, then we notify the user here.