kernel/v2: allow IPs to end in ".1" [GH-2914]

This commit is contained in:
Mitchell Hashimoto 2014-02-03 12:02:14 +01:00
parent 592c577b2e
commit ac439852ff
3 changed files with 7 additions and 3 deletions

View File

@ -62,6 +62,7 @@ BUG FIXES:
warn of potential issues. warn of potential issues.
- core: Synced folders set to the default synced folder explicitly won't - core: Synced folders set to the default synced folder explicitly won't
be deleted. [GH-2873] be deleted. [GH-2873]
- core: Static IPs can end in ".1". A warning is now shown. [GH-2914]
- commands/box: Box add `--force` works with `--provider` flag. [GH-2757] - commands/box: Box add `--force` works with `--provider` flag. [GH-2757]
- commands/box: Listing boxes with machine-readable output crash is gone. - commands/box: Listing boxes with machine-readable output crash is gone.
- commands/plugin: Plugin installation will fail if dependencies conflict, - commands/plugin: Plugin installation will fail if dependencies conflict,

View File

@ -495,7 +495,8 @@ module VagrantPlugins
end end
if options[:ip] && options[:ip].end_with?(".1") if options[:ip] && options[:ip].end_with?(".1")
errors << I18n.t("vagrant.config.vm.network_ip_ends_in_one") machine.ui.warn(I18n.t(
"vagrant.config.vm.network_ip_ends_in_one"))
end end
end end
end end

View File

@ -869,8 +869,10 @@ en:
on Windows, NFS isn't supported. If the problem persists, please on Windows, NFS isn't supported. If the problem persists, please
contact Vagrant support. contact Vagrant support.
network_ip_ends_in_one: |- network_ip_ends_in_one: |-
Static IPs cannot end in ".1" since that address is always You assigned a static IP ending in ".1" to this machine.
reserved for the router. Please use another ending. This is very often used by the router and can cause the
network to not work properly. If you the network doesn't work
properly, try changing this IP.
network_ip_required: |- network_ip_required: |-
An IP is required for a private network. An IP is required for a private network.
network_fp_host_not_unique: |- network_fp_host_not_unique: |-