diff options
author | Linus Torvalds | 2012-12-13 20:03:21 -0600 |
---|---|---|
committer | Linus Torvalds | 2012-12-13 20:03:21 -0600 |
commit | e05a1c6397a73d09389e033b6b2c25c954d2177c (patch) | |
tree | 699490e0c4f9f130361f4cd0dccc9a730e55dc75 /tools/testing/ktest/sample.conf | |
parent | 66cdd0ceaf65a18996f561b770eedde1d123b019 (diff) | |
parent | e1a6c3d748ef0ee093e764af3fdd0c1a5cd2b664 (diff) | |
download | kernel-omap-e05a1c6397a73d09389e033b6b2c25c954d2177c.tar.gz kernel-omap-e05a1c6397a73d09389e033b6b2c25c954d2177c.tar.xz kernel-omap-e05a1c6397a73d09389e033b6b2c25c954d2177c.zip |
Merge tag 'ktest-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull ktest update from Steven Rostedt:
"fixes and updated for new boot loaders"
* tag 'ktest-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: Test if target machine is up before install
ktest: Fix breakage from change of oldnoconfig to olddefconfig
ktest: Add native support for syslinux boot loader
ktest: Sync before reboot
ktest: Add support for grub2
Diffstat (limited to 'tools/testing/ktest/sample.conf')
-rw-r--r-- | tools/testing/ktest/sample.conf | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf index de28a0a3b8fc..4012e9330344 100644 --- a/tools/testing/ktest/sample.conf +++ b/tools/testing/ktest/sample.conf | |||
@@ -332,8 +332,18 @@ | |||
332 | # from other linux builds on the system. | 332 | # from other linux builds on the system. |
333 | #LOCALVERSION = -test | 333 | #LOCALVERSION = -test |
334 | 334 | ||
335 | # For REBOOT_TYPE = grub2, you must specify where the grub.cfg | ||
336 | # file is. This is the file that is searched to find the menu | ||
337 | # option to boot to with GRUB_REBOOT | ||
338 | #GRUB_FILE = /boot/grub2/grub.cfg | ||
339 | |||
340 | # The tool for REBOOT_TYPE = grub2 to set the next reboot kernel | ||
341 | # to boot into (one shot mode). | ||
342 | # (default grub2_reboot) | ||
343 | #GRUB_REBOOT = grub2_reboot | ||
344 | |||
335 | # The grub title name for the test kernel to boot | 345 | # The grub title name for the test kernel to boot |
336 | # (Only mandatory if REBOOT_TYPE = grub) | 346 | # (Only mandatory if REBOOT_TYPE = grub or grub2) |
337 | # | 347 | # |
338 | # Note, ktest.pl will not update the grub menu.lst, you need to | 348 | # Note, ktest.pl will not update the grub menu.lst, you need to |
339 | # manually add an option for the test. ktest.pl will search | 349 | # manually add an option for the test. ktest.pl will search |
@@ -343,8 +353,33 @@ | |||
343 | # For example, if in the /boot/grub/menu.lst the test kernel title has: | 353 | # For example, if in the /boot/grub/menu.lst the test kernel title has: |
344 | # title Test Kernel | 354 | # title Test Kernel |
345 | # kernel vmlinuz-test | 355 | # kernel vmlinuz-test |
356 | # | ||
357 | # For grub2, a search of top level "menuentry"s are done. No | ||
358 | # submenu is searched. The menu is found by searching for the | ||
359 | # contents of GRUB_MENU in the line that starts with "menuentry". | ||
360 | # You may want to include the quotes around the option. For example: | ||
361 | # for: menuentry 'Test Kernel' | ||
362 | # do a: GRUB_MENU = 'Test Kernel' | ||
363 | # For customizing, add your entry in /etc/grub.d/40_custom. | ||
364 | # | ||
346 | #GRUB_MENU = Test Kernel | 365 | #GRUB_MENU = Test Kernel |
347 | 366 | ||
367 | # For REBOOT_TYPE = syslinux, the name of the syslinux executable | ||
368 | # (on the target) to use to set up the next reboot to boot the | ||
369 | # test kernel. | ||
370 | # (default extlinux) | ||
371 | #SYSLINUX = syslinux | ||
372 | |||
373 | # For REBOOT_TYPE = syslinux, the path that is passed to to the | ||
374 | # syslinux command where syslinux is installed. | ||
375 | # (default /boot/extlinux) | ||
376 | #SYSLINUX_PATH = /boot/syslinux | ||
377 | |||
378 | # For REBOOT_TYPE = syslinux, the syslinux label that references the | ||
379 | # test kernel in the syslinux config file. | ||
380 | # (default undefined) | ||
381 | #SYSLINUX_LABEL = "test-kernel" | ||
382 | |||
348 | # A script to reboot the target into the test kernel | 383 | # A script to reboot the target into the test kernel |
349 | # This and SWITCH_TO_TEST are about the same, except | 384 | # This and SWITCH_TO_TEST are about the same, except |
350 | # SWITCH_TO_TEST is run even for REBOOT_TYPE = grub. | 385 | # SWITCH_TO_TEST is run even for REBOOT_TYPE = grub. |
@@ -497,7 +532,7 @@ | |||
497 | #POST_BUILD_DIE = 1 | 532 | #POST_BUILD_DIE = 1 |
498 | 533 | ||
499 | # Way to reboot the box to the test kernel. | 534 | # Way to reboot the box to the test kernel. |
500 | # Only valid options so far are "grub" and "script" | 535 | # Only valid options so far are "grub", "grub2", "syslinux" and "script" |
501 | # (default grub) | 536 | # (default grub) |
502 | # If you specify grub, it will assume grub version 1 | 537 | # If you specify grub, it will assume grub version 1 |
503 | # and will search in /boot/grub/menu.lst for the title $GRUB_MENU | 538 | # and will search in /boot/grub/menu.lst for the title $GRUB_MENU |
@@ -505,6 +540,13 @@ | |||
505 | # your setup, then specify "script" and have a command or script | 540 | # your setup, then specify "script" and have a command or script |
506 | # specified in REBOOT_SCRIPT to boot to the target. | 541 | # specified in REBOOT_SCRIPT to boot to the target. |
507 | # | 542 | # |
543 | # For REBOOT_TYPE = grub2, you must define both GRUB_MENU and | ||
544 | # GRUB_FILE. | ||
545 | # | ||
546 | # For REBOOT_TYPE = syslinux, you must define SYSLINUX_LABEL, and | ||
547 | # perhaps modify SYSLINUX (default extlinux) and SYSLINUX_PATH | ||
548 | # (default /boot/extlinux) | ||
549 | # | ||
508 | # The entry in /boot/grub/menu.lst must be entered in manually. | 550 | # The entry in /boot/grub/menu.lst must be entered in manually. |
509 | # The test will not modify that file. | 551 | # The test will not modify that file. |
510 | #REBOOT_TYPE = grub | 552 | #REBOOT_TYPE = grub |