commit b510e251cef3557fc237e941d7e11e5c8491755d
author Allen Webb <allenwebb@google.com> Tue Mar 31 15:18:07 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Apr 01 22:39:01 2020 +0000
tree c44ed68c72648f73142a5231cbc904547de996fd
parent faec3abca6edb68b496ea938d499455e3b676752

deploy_termina: Add optional ssh port parameter -P

This makes it easier to use the script when using ssh port tunneling.

BUG=None
TEST=manually ran the script

Change-Id: Icc6625b58fe8b495c7138483c18913d5cb8e805d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2130639
Tested-by: Allen Webb <allenwebb@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Allen Webb <allenwebb@google.com>

contrib/deploy_termina

diff --git a/contrib/deploy_termina b/contrib/deploy_termina
index 9a9c3d6..247b69d 100755
--- a/contrib/deploy_termina
+++ b/contrib/deploy_termina
@@ -28,6 +28,7 @@
 DEFINE_boolean 'build_image' false 'Builds the image.' 'i'
 DEFINE_boolean 'test_image' true 'Use a testing termina image instead of a base image.' 't'
 DEFINE_string 'device_ip_addr' '' 'The ip of the device to deploy to.' 'd'
+DEFINE_integer 'device_port' 22 'The ssh port number of the device to deploy to.' 'P'
 DEFINE_boolean 'verbose' false 'Turns on verbose logging.' 'v'
 
 main() {
@@ -44,7 +45,8 @@
     if [[ ${FLAGS_verbose} -eq ${FLAGS_TRUE} ]]; then
       echo "Detecting device architecture..." >&2
     fi
-    uname_m=$(ssh "${SSH_OPTS[@]}" "root@${FLAGS_device_ip_addr}" "uname -m")
+    uname_m=$(ssh "${SSH_OPTS[@]}" "-p" "${FLAGS_device_port}" \
+      "root@${FLAGS_device_ip_addr}" "uname -m")
     case "${uname_m}" in
       x86_64) FLAGS_board='tatl' ;;
       aarch64) FLAGS_board='tael' ;;
@@ -89,7 +91,7 @@
     if [[ ${FLAGS_verbose} -eq ${FLAGS_TRUE} ]]; then
       echo "Copying image to device:" >&2
     fi
-    rsync -a "${out_dir}" -e "ssh ${SSH_OPTS[*]}" \
+    rsync -a "${out_dir}" -e "ssh ${SSH_OPTS[*]} -p ${FLAGS_device_port} " \
       "root@${FLAGS_device_ip_addr}:${STATEFUL_PARTITION}" \
       || die "Failed to copy to device."
     sudo rm -rf "${out_dir}"
@@ -108,8 +110,8 @@
     restart vm_cicerone
     restart vm_concierge
 EOF
-    ssh "${SSH_OPTS[@]}" "root@${FLAGS_device_ip_addr}" \
-      "${install_script}" \
+    ssh "${SSH_OPTS[@]}" "-p" "${FLAGS_device_port}" \
+      "root@${FLAGS_device_ip_addr}" "${install_script}" \
       || die "Failed to deploy to device."
   fi
 }