aboutsummaryrefslogtreecommitdiff
path: root/tcwg-buildslave
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-08-08 15:35:30 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2016-08-08 15:35:30 +0000
commit76aa2d5b38e659e74faba04a5414d8f7c75b35b1 (patch)
tree86af4df64f105011898da148d0af3f97a6ee1565 /tcwg-buildslave
parent95342cd4a8541aba03efccdaf8509fd05f6264c7 (diff)
Revert "tcwg-buildslave/.ssh/config: Use robust ControlPath"
Ubuntu Trusty's ssh doesn't yet support %C specifier in ControlPath. This reverts commit 95342cd4a8541aba03efccdaf8509fd05f6264c7. Change-Id: Id938f59bf77e1cdfe9f816620078191de9a6c3a7
Diffstat (limited to 'tcwg-buildslave')
-rw-r--r--tcwg-buildslave/.ssh/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/tcwg-buildslave/.ssh/config b/tcwg-buildslave/.ssh/config
index c9e6fa1..d6b4c23 100644
--- a/tcwg-buildslave/.ssh/config
+++ b/tcwg-buildslave/.ssh/config
@@ -28,7 +28,7 @@ Host *.tcwglab *.aus-colo *.lab
ControlPersist 5m
# Put the ssh socket on /tmp. Note that overlayfs can't host sockets,
# so we always arrange /tmp to be on a ext4 or equivalent FS.
- ControlPath /tmp/ssh-%C
+ ControlPath /tmp/ssh-%u-%r@%h:%p
# There is little point in forwarding X11 to machines outside of local network.
ForwardX11 no
# Forward authentication agent and keep private keys in one place.