Skip to content

Commit

Permalink
ktest: Do not opencode reboot in grub setting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Oct 20, 2011
1 parent 8d73521 commit c54367f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,8 @@ sub wait_for_input

sub reboot_to {
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;
}

Expand Down

0 comments on commit c54367f

Please sign in to comment.