From 42d0b52df7ea8f965a90ec5587cb56d47e554c43 Mon Sep 17 00:00:00 2001
From: Kostas Lekkas <kostas@lekkas.io>
Date: Wed, 20 Jul 2016 17:24:42 +0300
Subject: [PATCH] resin ssh: disable ControlMaster ssh option

This change was necessary because our ssh gateway does not
support ControlMaster mode.

Closes #366
---
 lib/actions/ssh.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/actions/ssh.coffee b/lib/actions/ssh.coffee
index f02fcb9e..e3f9f358 100644
--- a/lib/actions/ssh.coffee
+++ b/lib/actions/ssh.coffee
@@ -94,7 +94,11 @@ module.exports =
 			.then ({ username, uuid, containerId }) ->
 				throw new Error('Did not find running application container') if not containerId?
 				Promise.try ->
-					command = "ssh #{verbose} -t -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+					command = "ssh #{verbose} -t \
+						-o LogLevel=ERROR \
+						-o StrictHostKeyChecking=no \
+						-o UserKnownHostsFile=/dev/null \
+						-o ControlMaster=no \
 						-p #{options.port} #{username}@ssh.#{settings.get('proxyUrl')} enter #{uuid} #{containerId}"
 
 					subShellCommand = getSubShellCommand(command)