浏览代码

ktest: Do not opencode reboot in grub setting

When setting the next kernel to boot to with grub, do not opencode
the reboot operation.  The normal reboot operation can be modified by
config options (namely POWERCYCLE_AFTER_REBOOT). This needs to affect
all reboots. Remove the opencoded reboot to make sure that any changes
to the reboot code also affect all reboots.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt 13 年之前
父节点
当前提交
c54367f9d6
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      tools/testing/ktest/ktest.pl

+ 2 - 1
tools/testing/ktest/ktest.pl

@@ -1150,7 +1150,8 @@ sub wait_for_input
 
 
 sub reboot_to {
 sub reboot_to {
     if ($reboot_type eq "grub") {
     if ($reboot_type eq "grub") {
-	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch && reboot)'";
+	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
+	reboot;
 	return;
 	return;
     }
     }