summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2012-03-21 13:24:57 +0100
committerSteven Rostedt <rostedt@goodmis.org>2012-03-21 13:24:57 +0100
commit769df641cc1b870c0d7f95d6433416bf2c6c2b5e (patch)
tree51d9ef1fc27ae6928afa9d1a7d565a269b2e05c4
parentktest: Add SCP_TO_TARGET_INSTALL option (diff)
downloadlinux-769df641cc1b870c0d7f95d6433416bf2c6c2b5e.tar.xz
linux-769df641cc1b870c0d7f95d6433416bf2c6c2b5e.zip
ktest: Fix SWITCH_TO_GOOD to also reboot the machine
When the option SWITCH_TO_GOOD is set, it will be called when the system needs to reboot to the good server. But currently, this keeps the reboot from happening. The SWITCH_TO_GOOD is just a way to get to a new kernel, it may not mean to not reboot. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xtools/testing/ktest/ktest.pl1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 1143e6c5f07f..e7fed7903939 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1116,7 +1116,6 @@ sub reboot_to_good {
if (defined($switch_to_good)) {
run_command $switch_to_good;
- return;
}
reboot $time;