From 352f875dbf969ee2e909222a449979b9fa04cff4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 11 Jun 2013 14:10:57 -0700
Subject: [PATCH] builder/amazonebs: Handle interrupts while waiting for SSH

---
 builder/amazonebs/step_connect_ssh.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/builder/amazonebs/step_connect_ssh.go b/builder/amazonebs/step_connect_ssh.go
index e297ca076..69bc45220 100644
--- a/builder/amazonebs/step_connect_ssh.go
+++ b/builder/amazonebs/step_connect_ssh.go
@@ -83,6 +83,11 @@ ConnectWaitLoop:
 		case <-timeout:
 			ui.Error("Timeout while waiting to connect to SSH.")
 			return multistep.ActionHalt
+		case <-time.After(1 * time.Second):
+			if _, ok := state[multistep.StateCancelled]; ok {
+				log.Println("Interrupt detected, quitting waiting for SSH.")
+				return multistep.ActionHalt
+			}
 		}
 	}