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

Do better handling given netmasks

This commit is contained in:
Chris Roberts 2018-01-03 17:26:08 -08:00
parent 9596765034
commit 913b5639e5
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/guests/debian/cap/configure_networks.rb
View File

@ -38,8 +38,15 @@ module VagrantPlugins
networks.each do |network|
e_config = {}.tap do |entry|
if network[:ip]
mask = IPAddr.new(network.fetch(:netmask, "255.255.255.0")).to_i.to_s(2).count("1")
entry["addresses"] = ["#{network[:ip]}/#{mask}"]
mask = network[:netmask]
if mask && IPAddr.new(network[:ip]).ipv4?
begin
mask = IPAddr.new(mask).to_i.to_s(2).count("1")
rescue IPAddr::Error
# ignore and use given value
end
end
entry["addresses"] = [[network[:ip], mask].compact.join("/")]
else
entry["dhcp4"] = true
end
@ -72,9 +79,17 @@ module VagrantPlugins
net_conf << "Name=#{dev_name}"
net_conf << "[Network]"
if network[:ip]
mask = IPAddr.new(network.fetch(:netmask, "255.255.255.0")).to_i.to_s(2).count("1")
mask = network[:netmask]
if mask && IPAddr.new(network[:ip]).ipv4?
begin
mask = IPAddr.new(mask).to_i.to_s(2).count("1")
rescue IPAddr::Error
# ignore and use given value
end
end
address = [network[:ip], mask].compact.join("/")
net_conf << "DHCP=no"
net_conf << "Address=#{network[:ip]}/#{mask}"
net_conf << "Address=#{address}"
net_conf << "Gateway=#{network[:gateway]}" if network[:gateway]
else
net_conf << "DHCP=yes"