GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmx.net>
Reviewed-on: https://review.coreboot.org/14522
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
This commit is contained in:
Jonathan Neuschäfer 2016-05-10 17:43:53 +02:00 committed by Martin Roth
parent 478c889847
commit 4aef682819
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/board_status/board_status.sh
View File

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