From 6ac90d6dc5634ab09ce2fc5b061e6602d404aa3d Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Mon, 4 Feb 2013 23:08:49 -0500
Subject: [PATCH] --- yaml --- r: 357695 b: refs/heads/master c:
 d6845536236a72382a20483887943a599d7c2b69 h: refs/heads/master i:   357693:
 a13f28017bc0272e0721ab4283bf3d313fa217b1   357691:
 99a22055584af33ea3e01e109728d67991cfbcc3   357687:
 a044af0c30512aa20085e6ffa559c30b9f883399   357679:
 bd081fc70bea63fa1a06a17d6f2f969ff14567dd   357663:
 957b55ccc45d45380ae809d9d70e7b675c3b7219   357631:
 3c4188ae49cc3e060c0dbccba1d9b5b23829ac3e v: v3

---
 [refs]                             | 2 +-
 trunk/tools/testing/ktest/ktest.pl | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de0f7865cec6..b5b788e2f27b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4283b169abfb0380850b56287ee644697ecf321a
+refs/heads/master: d6845536236a72382a20483887943a599d7c2b69
diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl
index 3fd768e65998..839989d08dc2 100755
--- a/trunk/tools/testing/ktest/ktest.pl
+++ b/trunk/tools/testing/ktest/ktest.pl
@@ -1212,11 +1212,16 @@ sub reboot {
     }
 
     if (defined($time)) {
-	if (wait_for_monitor($time, $reboot_success_line)) {
+	# Look for the good kernel to boot
+	if (wait_for_monitor($time, "Linux version")) {
 	    # reboot got stuck?
 	    doprint "Reboot did not finish. Forcing power cycle\n";
 	    run_command "$power_cycle";
 	}
+
+	# Still need to wait for the reboot to finish
+	wait_for_monitor($time, $reboot_success_line);
+
 	end_monitor;
     }
 }