mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
ktest.pl: Fix missing "end_monitor" when machine check fails
commite8bf9b98d4
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:6474ace999
("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>
This commit is contained in:
parent
a467e3e04d
commit
81dca9177d
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue