Merge pull request #9685 from briancain/improve-hostonly-conf-error
Improve network collision error message
This commit is contained in:
commit
42df3e7185
|
@ -280,8 +280,12 @@ module VagrantPlugins
|
|||
# interface.
|
||||
@env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
|
||||
that_netaddr = network_address(interface[:ip], interface[:netmask])
|
||||
raise Vagrant::Errors::NetworkCollision if \
|
||||
netaddr == that_netaddr && interface[:status] != "Down"
|
||||
if netaddr == that_netaddr && interface[:status] != "Down"
|
||||
raise Vagrant::Errors::NetworkCollision,
|
||||
netaddr: netaddr,
|
||||
that_netaddr: that_netaddr,
|
||||
interface_name: interface[:name]
|
||||
end
|
||||
end
|
||||
|
||||
# Split the IP address into its components
|
||||
|
|
|
@ -2076,6 +2076,9 @@ en:
|
|||
This will cause your specified IP to be inaccessible. Please change
|
||||
the IP or name of your host only network so that it no longer matches that of
|
||||
a bridged or non-hostonly network.
|
||||
|
||||
Bridged Network Address: '%{netaddr}'
|
||||
Host-only Network '%{interface_name}': '%{that_netaddr}'
|
||||
creating: "Creating new host only network for environment..."
|
||||
enabling: "Enabling host only network..."
|
||||
not_found: |-
|
||||
|
|
Loading…
Reference in New Issue