Merge pull request #675 from scoates/755499
ignore host-only interface if it is down
This commit is contained in:
commit
17224e3df6
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue