From 2d9ba0e906f7d7d1d153cd5d13575971e394952f Mon Sep 17 00:00:00 2001 From: Daniel Poggenpohl Date: Thu, 17 Jan 2019 14:59:52 +0100 Subject: [PATCH] - FIX for #10594 (more logical flow) --- plugins/guests/solaris11/cap/configure_networks.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/guests/solaris11/cap/configure_networks.rb b/plugins/guests/solaris11/cap/configure_networks.rb index baed753df..ece56d3cd 100644 --- a/plugins/guests/solaris11/cap/configure_networks.rb +++ b/plugins/guests/solaris11/cap/configure_networks.rb @@ -14,12 +14,12 @@ module VagrantPlugins cidr = mask.split(".").map { |e| e.to_i.to_s(2).rjust(8, "0") }.join.count("1").to_s if network[:type].to_sym == :static - if machine.communicate.test("ipadm | grep #{device}/v4") - machine.communicate.execute("#{su_cmd} ipadm delete-addr #{device}/v4") - end unless machine.communicate.test("ipadm show-if #{device}") machine.communicate.execute("#{su_cmd} ipadm create-ip #{device}") end + 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 if machine.communicate.test("ipadm show-if -o all | grep #{device} | tr -s ' ' | cut -d ' ' -f 6 | grep '4\|6'")