From 4c070a04d23d67e36d0d597903141e9b8ab01a06 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sun, 23 Feb 2014 22:25:59 -0800
Subject: [PATCH] core: if can't communicate, force halt right away

---
 lib/vagrant/action/builtin/graceful_halt.rb | 22 ++++++++++-----------
 templates/locales/en.yml                    |  5 +++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/vagrant/action/builtin/graceful_halt.rb b/lib/vagrant/action/builtin/graceful_halt.rb
index c119af4e9..393c81398 100644
--- a/lib/vagrant/action/builtin/graceful_halt.rb
+++ b/lib/vagrant/action/builtin/graceful_halt.rb
@@ -44,23 +44,23 @@ module Vagrant
           # Only attempt to perform graceful shutdown under certain cases
           # checked above.
           if graceful
-            env[:ui].info I18n.t("vagrant.actions.vm.halt.graceful")
+            env[:ui].output(I18n.t("vagrant.actions.vm.halt.graceful"))
 
             begin
               env[:machine].guest.capability(:halt)
-            rescue Errors::MachineGuestNotReady
-              @logger.info("Machine guest not ready while attempting to halt. Ignoring.")
-            end
 
-            @logger.debug("Waiting for target graceful halt state: #{@target_state}")
-            begin
-              Timeout.timeout(env[:machine].config.vm.graceful_halt_timeout) do
-                while env[:machine].state.id != @target_state
-                  sleep 1
+              @logger.debug("Waiting for target graceful halt state: #{@target_state}")
+              begin
+                Timeout.timeout(env[:machine].config.vm.graceful_halt_timeout) do
+                  while env[:machine].state.id != @target_state
+                    sleep 1
+                  end
                 end
+              rescue Timeout::Error
+                # Don't worry about it, we catch the case later.
               end
-            rescue Timeout::Error
-              # Don't worry about it, we catch the case later.
+            rescue Errors::MachineGuestNotReady
+              env[:ui].detail(I18n.t("vagrant.actions.vm.halt.guest_not_ready"))
             end
 
             # The result of this matters on whether we reached our
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index e96774c50..273b7ba74 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1312,6 +1312,11 @@ en:
             Forcing shutdown of VM...
           graceful: |-
             Attempting graceful shutdown of VM...
+          guest_not_ready: |-
+            Guest communication could not be established! This is usually because
+            SSH is not running, the authentication information was changed,
+            or some other networking issue. Vagrant will force halt, if
+            capable.
         hostname:
           setting: "Setting hostname..."
         import: