mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
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>
This commit is contained in:
parent
dab227639f
commit
c4b2621fab
@ -1384,7 +1384,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…
x
Reference in New Issue
Block a user