plugins/guests/solaris11/cap/configure_networks.rb in vagrant-unbundled-2.0.0.1 vs plugins/guests/solaris11/cap/configure_networks.rb in vagrant-unbundled-2.0.1.0
- old
+ new
@@ -10,22 +10,16 @@
networks.each do |network|
device = "#{machine.config.solaris11.device}#{network[:interface]}"
su_cmd = machine.config.solaris11.suexec_cmd
mask = "#{network[:netmask]}"
cidr = mask.split(".").map { |e| e.to_i.to_s(2).rjust(8, "0") }.join.count("1").to_s
- #ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
- #machine.communicate.execute("#{ifconfig_cmd} plumb")
+
if network[:type].to_sym == :static
- #machine.communicate.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
- #machine.communicate.execute("#{ifconfig_cmd} up")
- #machine.communicate.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
- # ipadm create-addr -T static -a local=172.16.10.15/24 net2/v4
if machine.communicate.test("ipadm | grep #{device}/v4")
machine.communicate.execute("#{su_cmd} ipadm delete-addr #{device}/v4")
end
machine.communicate.execute("#{su_cmd} ipadm create-addr -T static -a #{network[:ip]}/#{cidr} #{device}/v4")
elsif network[:type].to_sym == :dhcp
- #machine.communicate.execute("#{ifconfig_cmd} dhcp start")
if machine.communicate.test("ipadm show-if -o all | grep #{device} | tr -s ' ' | cut -d ' ' -f 6 | grep '4\|6'")
machine.communicate.execute("#{su_cmd} ipadm create-addr -T addrconf #{device}/v4")
end
end
end