[coreboot-gerrit] Patch set updated for coreboot: board_status: Add an option to set the SSH port

[Jonathan Neuschäfer (j.neuschaefer@gmx.net)]

Jonathan Neuschäfer (j.neuschaefer at gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14522

-gerrit

commit 28f9775a7a5f5a4649d6c9569d96aef5fa48509e
Author: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
Date:   Fri May 6 01:08:42 2016 +0200

    board_status: Add an option to set the SSH port
    
    If the option is not provided, ssh uses the default port for the host,
    which is usually 22, but may be overridden in the user's SSH
    configuration.
    
    Change-Id: I303e9aeae16bd73a96c5e6d54f8e39482613db28
    Signed-off-by: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
---
 util/board_status/board_status.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 29d05b0..fd0c8a8 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -12,6 +12,7 @@ EXIT_FAILURE=1
 # Stuff from command-line switches
 COREBOOT_IMAGE="build/coreboot.rom"
 REMOTE_HOST=""
+REMOTE_PORT_OPT=""
 CLOBBER_OUTPUT=0
 UPLOAD_RESULTS=0
 SERIAL_PORT_SPEED=115200
@@ -39,7 +40,7 @@ test_cmd()
 	fi
 
 	if [ "$1" -eq "$REMOTE" ] && [ -n "$REMOTE_HOST" ]; then
-		ssh root@${REMOTE_HOST} command -v "$2" > /dev/null
+		ssh $REMOTE_PORT_OPT root@${REMOTE_HOST} command -v "$2" > /dev/null
 		rc=$?
 	else
 		command -v "$2" >/dev/null
@@ -71,7 +72,7 @@ _cmd()
 	fi
 
 	if [ "$1" -eq "$REMOTE" ] && [ -n "$REMOTE_HOST" ]; then
-		ssh "root@${REMOTE_HOST}" "$2" > "$pipe_location" 2>&1
+		ssh $REMOTE_PORT_OPT "root@${REMOTE_HOST}" "$2" > "$pipe_location" 2>&1
 	else
 		$2 > "$pipe_location" 2>&1
 	fi
@@ -179,6 +180,8 @@ Options
         Path to coreboot image (Default is $COREBOOT_IMAGE).
     -r  <host>
         Obtain machine information from remote host (using ssh).
+    --ssh-port <port>
+        Use a specific SSH port.
     -s  </dev/xxx>
         Obtain boot log via serial device.
     -S  <speed>
@@ -194,8 +197,7 @@ if [ $? -ne 4 ]; then
 	exit $EXIT_FAILURE
 fi
 
-# TODO: add longopts in the quotes after -l
-ARGS=$(getopt -o Chi:r:s:S:u -l "" -n "$0" -- "$@");
+ARGS=$(getopt -o Chi:r:s:S:u -l "ssh-port:" -n "$0" -- "$@");
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 eval set -- "$ARGS"
 while true ; do
@@ -215,6 +217,10 @@ while true ; do
 			shift
 			REMOTE_HOST="$1"
 			;;
+		--ssh-port)
+			shift
+			REMOTE_PORT_OPT="-p $1"
+			;;
 		-s)
 			shift
 			SERIAL_DEVICE="$1"