diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-10-20 09:56:41 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-10-20 09:56:41 -0400 |
| commit | c54367f9d6be8e19c6e98ae7038438f0377ee138 (patch) | |
| tree | 167987b186f57779f1e19726af9f2f35315d5e23 /tools/testing | |
| parent | 8d735212e441af855afd28ccc402fcaf12999f8d (diff) | |
| download | linux-3.10-c54367f9d6be8e19c6e98ae7038438f0377ee138.tar.gz linux-3.10-c54367f9d6be8e19c6e98ae7038438f0377ee138.tar.bz2 linux-3.10-c54367f9d6be8e19c6e98ae7038438f0377ee138.zip | |
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>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 1bda07f6d67..d60c496fb51 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -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; } |