ignore interface if it is Ddown (not 100% sure about vbox4.0 support; please test)

This commit is contained in:
Sean Coates 2012-01-23 10:38:18 -05:00
parent f2eff93c38
commit 755499dcf9
3 changed files with 5 additions and 1 deletions

View File

@ -298,7 +298,7 @@ module Vagrant
@env[:vm].driver.read_bridged_interfaces.each do |interface|
that_netaddr = network_address(interface[:ip], interface[:netmask])
raise Errors::NetworkCollision if this_netaddr == that_netaddr
raise Errors::NetworkCollision if this_netaddr == that_netaddr && interface[:status] != "Down"
end
end

View File

@ -273,6 +273,8 @@ module Vagrant
info[:ip] = $1.to_s
elsif line =~ /^NetworkMask:\s+(.+?)$/
info[:netmask] = $1.to_s
elsif line =~ /^Status:\s+(.+?)$/
info[:status] = $1.to_s
end
end

View File

@ -273,6 +273,8 @@ module Vagrant
info[:ip] = $1.to_s
elsif line =~ /^NetworkMask:\s+(.+?)$/
info[:netmask] = $1.to_s
elsif line =~ /^Status:\s+(.+?)$/
info[:status] = $1.to_s
end
end