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

kernel/v2: allow private network type to be a string [GH-3349]

This commit is contained in:
Mitchell Hashimoto 2014-04-01 21:57:23 -07:00
parent 42039ee73b
commit 84f7c019f9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ BUG FIXES:
- core: Removing a specific box version that doesn't exist doesn't - core: Removing a specific box version that doesn't exist doesn't
crash Vagrant. [GH-3364] crash Vagrant. [GH-3364]
- core: SSH commands are forced to be ASCII. - core: SSH commands are forced to be ASCII.
- core: private networks with DHCP type work if type parameter is
a string and not a symbol. [GH-3349]
- commands/status: Machine readable output contains the target. [GH-3218] - commands/status: Machine readable output contains the target. [GH-3218]
- guests/debian: Changing host name works properly. [GH-3283] - guests/debian: Changing host name works properly. [GH-3283]
- guests/suse: Shutdown works correctly on SLES [GH-2775] - guests/suse: Shutdown works correctly on SLES [GH-2775]

2
plugins/kernel_v2/config/vm.rb
View File

@ -578,7 +578,7 @@ module VagrantPlugins
end end
if type == :private_network if type == :private_network
if options[:type] != :dhcp if options[:type].to_sym != :dhcp
if !options[:ip] if !options[:ip]
errors << I18n.t("vagrant.config.vm.network_ip_required") errors << I18n.t("vagrant.config.vm.network_ip_required")
end end