diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2023-01-18 11:31:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-10 09:40:10 +0100 |
| commit | aab7db9e1e08879f64a4b935fc83e851f0c8d4d7 (patch) | |
| tree | 1616443adb9a2153a114df8c3780fb66c6d0bec7 /tools | |
| parent | 0c2f4a234bb2b6fa56668057ca01e2a6623ccfcd (diff) | |
| download | linux-aab7db9e1e08879f64a4b935fc83e851f0c8d4d7.tar.gz linux-aab7db9e1e08879f64a4b935fc83e851f0c8d4d7.tar.bz2 linux-aab7db9e1e08879f64a4b935fc83e851f0c8d4d7.zip | |
ktest.pl: Fix missing "end_monitor" when machine check fails
commit e8bf9b98d40dbdf4e39362e3b85a70c61da68cb7 upstream.
In the "reboot" command, it does a check of the machine to see if it is
still alive with a simple "ssh echo" command. If it fails, it will assume
that a normal "ssh reboot" is not possible and force a power cycle.
In this case, the "start_monitor" is executed, but the "end_monitor" is
not, and this causes the screen will not be given back to the console. That
is, after the test, a "reset" command needs to be performed, as "echo" is
turned off.
Cc: stable@vger.kernel.org
Fixes: 6474ace999edd ("ktest.pl: Powercycle the box on reboot if no connection can be made")
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 56620c3fea04..2a0721b76a94 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1488,7 +1488,8 @@ sub reboot { # Still need to wait for the reboot to finish wait_for_monitor($time, $reboot_success_line); - + } + if ($powercycle || $time) { end_monitor; } } |