---

yaml --- r: 357695 b: refs/heads/master c: d684553 h: refs/heads/master i: 357693: a13f280 357691: 99a2205 357687: a044af0 357679: bd081fc 357663: 957b55c 357631: 3c4188a v: v3
git-mirror · Feb 5, 2013 · 6ac90d6 · 6ac90d6
1 parent 378bde3
commit 6ac90d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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;
     }
 }