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

Merge pull request #3874 from gpurkins/sol11-networkfix 

guests/solaris11: Added conditional for temporary interfaces
This commit is contained in:
Mitchell Hashimoto 2014-05-22 10:22:30 -07:00
parent 43f347a737 dcc7a755c9
commit aa70a816a5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/solaris11/cap/configure_networks.rb
View File

@ -22,7 +22,9 @@ module VagrantPlugins
machine.communicate.execute("#{su_cmd} ipadm create-addr -T static -a #{network[:ip]}/#{cidr} #{device}/v4") machine.communicate.execute("#{su_cmd} ipadm create-addr -T static -a #{network[:ip]}/#{cidr} #{device}/v4")
elsif network[:type].to_sym == :dhcp elsif network[:type].to_sym == :dhcp
#machine.communicate.execute("#{ifconfig_cmd} dhcp start") #machine.communicate.execute("#{ifconfig_cmd} dhcp start")
machine.communicate.execute("#{su_cmd} ipadm create-addr -T addrconf #{device}/v4") 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
end end
end end