From cbf141796487045d3aeded0bbd64deaf58f25c58 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 18 Jul 2013 11:48:20 -0400
Subject: [PATCH] Change solaris shut down command to properly shut down
 [Gh-1506]

---
 CHANGELOG.md                       | 1 +
 plugins/guests/solaris/cap/halt.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a85af9d5..035e79129 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ BUG FIXES:
   - Default VirtualBox VM name now contains the machine name as defined
     in the Vagrantfile, helping differentiate multi-VM. [GH-1281]
   - NFS works properly on CentOS hosts. [GH-1394]
+  - Solaris guests actually shut down properly. [GH-1506]
 
 ## 1.2.4 (July 16, 2013)
 
diff --git a/plugins/guests/solaris/cap/halt.rb b/plugins/guests/solaris/cap/halt.rb
index 62959c4b7..3a60fd171 100644
--- a/plugins/guests/solaris/cap/halt.rb
+++ b/plugins/guests/solaris/cap/halt.rb
@@ -9,7 +9,8 @@ module VagrantPlugins
           #
           # does not exist in /etc/user_attr. TODO
           begin
-            machine.communicate.execute("#{machine.config.solaris.suexec_cmd} /usr/sbin/poweroff")
+            machine.communicate.execute(
+              "#{machine.config.solaris.suexec_cmd} /usr/sbin/shutdown -y -i5 -g0")
           rescue IOError
             # Ignore, this probably means connection closed because it
             # shut down.