From 4849ec8f7c4826cc888df9ced5ab7833fa807313 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 5 Jan 2015 09:52:19 -0800
Subject: [PATCH] guests/solaris: merge config properly [GH-5092]

---
 CHANGELOG.md                     |  2 ++
 plugins/guests/solaris/config.rb | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46bacc4d2..c4394381d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ BUG FIXES:
       strategy name [GH-4975]
   - commands/push: validate the configuration
   - guests/arch: fix network configuration due to poor line breaks. [GH-4964]
+  - guests/solaris: Merge configurations properly so configs can be set
+      in default Vagrantfiles. [GH-5092]
   - providers/docker: Symlinks in shared folders work. [GH-5093]
   - providers/hyperv: VM start errors turn into proper Vagrant errors. [GH-5101]
   - provisioners/chef: remove Chef version check from solo.rb generation and
diff --git a/plugins/guests/solaris/config.rb b/plugins/guests/solaris/config.rb
index e0a6a486b..5983b6837 100644
--- a/plugins/guests/solaris/config.rb
+++ b/plugins/guests/solaris/config.rb
@@ -3,24 +3,28 @@ module VagrantPlugins
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :halt_timeout
       attr_accessor :halt_check_interval
-      # This sets the command to use to execute items as a superuser. sudo is default
+
       attr_accessor :suexec_cmd
       attr_accessor :device
 
       def initialize
         @halt_timeout = UNSET_VALUE
         @halt_check_interval = UNSET_VALUE
-        @suexec_cmd = 'sudo'
-        @device = "e1000g"
+        @suexec_cmd = UNSET_VALUE
+        @device = UNSET_VALUE
       end
 
       def finalize!
         if @halt_timeout != UNSET_VALUE
           puts "solaris.halt_timeout is deprecated and will be removed in Vagrant 1.7"
         end
+
         if @halt_check_interval != UNSET_VALUE
           puts "solaris.halt_check_interval is deprecated and will be removed in Vagrant 1.7"
         end
+
+        @suexec_cmd = "sudo" if @suexec_cmd == UNSET_VALUE
+        @device     = "e1000g" if @device == UNSET_VALUE
       end
     end
   end