remote_access: use hostname, etc., hash
When using fairly long hostnames (e.g., the
chromeosA-rowB-rackC-hostD.<sub1>.<sub2>.google.com hostnames spat out
by `skylab lease-dut`), one can run into limitations on unix socket path
length:
unix_listener: path "/tmp/update_kernel.GkRDhJ/ssh_controlroot@chromeosA-rowB-rackC-hostD.<sub1>.<sub2>.google.com:22.wzHsMUlaYTn0GP73" too long for Unix domain socket
ssh_config(5) provides '%C' ("hash of %l%h%p%r") as a helpful
fixed-length alternative. The basename ("ssh_control...") in this case
reduces from 87 to 52 characters, leaving room for the "${TMP}" portion.
BUG=none
TEST=`./update_kernel.sh --remote=root@chromeosA-rowB-rackC-hostD.<sub1>.<sub2>.google.com`
Change-Id: I9e2ad65bd7c49f1d5320dc880b467ef44e012d9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2310866
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/remote_access.sh b/remote_access.sh
index dad88e2..ac859af 100644
--- a/remote_access.sh
+++ b/remote_access.sh
@@ -269,7 +269,7 @@
remote_access_init() {
TMP_PRIVATE_KEY=$TMP/private_key
TMP_KNOWN_HOSTS=$TMP/known_hosts
- TMP_CONTROL_FILE="${TMP}/ssh_control%r@%h:%p"
+ TMP_CONTROL_FILE="${TMP}/ssh_control-%C"
if [ -z "$FLAGS_remote" ]; then
echo "Please specify --remote=<IP-or-hostname> of the Chromium OS instance"
