From 0dcfb592205cfc8216c7cfd5f60f77b240b2bd4e Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Sat, 16 Sep 2017 18:43:08 -0700 Subject: [PATCH] board_status: Don't fetch dmesg via SSH when run over serial MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It doesn't make much sense to try and obtain dmesg via SSH if we're using the serial port. Serial should only be used to obtain dmesg if SSH is unavailable. Change-Id: Iec70e64666f9446cf7e98a0fbcaa1cd5cefd8898 Signed-off-by: David Hendricks Reviewed-on: https://review.coreboot.org/21567 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Neuschäfer Reviewed-by: Martin Roth --- util/board_status/board_status.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 8927bc012e..dc821049da 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -146,8 +146,7 @@ get_serial_bootlog () { echo echo "Waiting to receive boot log from $TTY" - echo "Press [Enter] when the boot is complete and the" - echo "system is ready for ssh to get the dmesg log." + echo "Press [Enter] when the boot is complete." echo if [ $tput_not_available -eq 0 ]; then @@ -371,13 +370,13 @@ if [ -z "$SERIAL_DEVICE" ]; then cmd $REMOTE "$cbmem_cmd -c" "${tmpdir}/${results}/coreboot_console.txt" echo "Getting timestamp data" cmd_nonfatal $REMOTE "$cbmem_cmd -t" "${tmpdir}/${results}/coreboot_timestamps.txt" + + echo "Getting remote dmesg" + cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt" else get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/coreboot_console.txt" fi -echo "Getting remote dmesg" -cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt" - # # Finish up. #