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

Merge pull request #1925 from ROBLOX/master 

Allow setting IP when using DHCP private network
This commit is contained in:
Mitchell Hashimoto 2013-07-12 17:22:08 -07:00
parent 6d26c86c4c 28e7ae1d05
commit bb808635f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/providers/virtualbox/action/network.rb
View File

@ -220,7 +220,7 @@ module VagrantPlugins
options[:type] = options[:type].to_sym options[:type] = options[:type].to_sym
# Default IP is in the 20-bit private network block for DHCP based networks # Default IP is in the 20-bit private network block for DHCP based networks
options[:ip] = "172.28.128.1" if options[:type] == :dhcp options[:ip] = "172.28.128.1" if options[:type] == :dhcp && options[:ip].nil?
# Calculate our network address for the given IP/netmask # Calculate our network address for the given IP/netmask
netaddr = network_address(options[:ip], options[:netmask]) netaddr = network_address(options[:ip], options[:netmask])