X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=remote%2Fssh;h=2bacc68e22b9df386cef7008c52f547baab49340;hp=b5062447096b53b2d3ea0e9f4ca7d664b74335d8;hb=005768a07918915222b45759a91d2af203b98375;hpb=a11ad78672a096632b15a660509d7dd5f7c5eae5

diff --git a/remote/ssh b/remote/ssh
index b506244..2bacc68 100755
--- a/remote/ssh
+++ b/remote/ssh
@@ -2,8 +2,16 @@
 tool=$(readlink -e "${0%/*}/..")
 . "$tool"/remote/lib.sh
 
+install -d -m 770 \
+ "$tool"/var/run \
+ "$tool"/var/run/ssh
 ssh \
- -o StrictHostKeyChecking=yes \
- -o UserKnownHostsFile="$tool"/etc/openssh/known_hosts \
+ -F "$tool"/etc/ssh/remote.conf \
+ -o ControlMaster=autoask \
+ -o ControlPath="$tool"/var/run/ssh/"%h-%p-%r" \
  -o HashKnownHosts=no \
- "$@"
+ -o StrictHostKeyChecking=yes \
+ -o UserKnownHostsFile="$tool"/etc/ssh/known_hosts \
+ "${@:-$local_ipv4}"
+# NOTE: pas dans le ssh de squeeze :
+ #-o ControlPersist=no \