summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasayoshi Mizuma <m.mizuma@jp.fujitsu.com>2019-05-09 17:36:47 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-05-10 14:54:52 -0400
commitd20f6b41b7c2715b3d900f2da02029dbc14cd60a (patch)
tree6dfad51d5e3245648ac8bc8f3f737b3933693eee
parent00603cd687db3b7cc5e62a186dca66e4a5fa03dc (diff)
ktest: update sample.conf for grub2bls
Update sample.conf for grub2bls Link: http://lkml.kernel.org/r/20190509213647.6276-7-msys.mizuma@gmail.com Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--tools/testing/ktest/sample.conf20
1 files changed, 18 insertions, 2 deletions
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 8c893a58b68e..c3bc933d437b 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -349,13 +349,13 @@
349# option to boot to with GRUB_REBOOT 349# option to boot to with GRUB_REBOOT
350#GRUB_FILE = /boot/grub2/grub.cfg 350#GRUB_FILE = /boot/grub2/grub.cfg
351 351
352# The tool for REBOOT_TYPE = grub2 to set the next reboot kernel 352# The tool for REBOOT_TYPE = grub2 or grub2bls to set the next reboot kernel
353# to boot into (one shot mode). 353# to boot into (one shot mode).
354# (default grub2_reboot) 354# (default grub2_reboot)
355#GRUB_REBOOT = grub2_reboot 355#GRUB_REBOOT = grub2_reboot
356 356
357# The grub title name for the test kernel to boot 357# The grub title name for the test kernel to boot
358# (Only mandatory if REBOOT_TYPE = grub or grub2) 358# (Only mandatory if REBOOT_TYPE = grub or grub2 or grub2bls)
359# 359#
360# Note, ktest.pl will not update the grub menu.lst, you need to 360# Note, ktest.pl will not update the grub menu.lst, you need to
361# manually add an option for the test. ktest.pl will search 361# manually add an option for the test. ktest.pl will search
@@ -374,6 +374,10 @@
374# do a: GRUB_MENU = 'Test Kernel' 374# do a: GRUB_MENU = 'Test Kernel'
375# For customizing, add your entry in /etc/grub.d/40_custom. 375# For customizing, add your entry in /etc/grub.d/40_custom.
376# 376#
377# For grub2bls, a search of "title"s are done. The menu is found
378# by searching for the contents of GRUB_MENU in the line that starts
379# with "title".
380#
377#GRUB_MENU = Test Kernel 381#GRUB_MENU = Test Kernel
378 382
379# For REBOOT_TYPE = syslinux, the name of the syslinux executable 383# For REBOOT_TYPE = syslinux, the name of the syslinux executable
@@ -479,6 +483,11 @@
479# default (undefined) 483# default (undefined)
480#POST_KTEST = ${SSH} ~/dismantle_test 484#POST_KTEST = ${SSH} ~/dismantle_test
481 485
486# If you want to remove the kernel entry in Boot Loader Specification (BLS)
487# environment, use kernel-install command.
488# Here's the example:
489#POST_KTEST = ssh root@Test "/usr/bin/kernel-install remove $KERNEL_VERSION"
490
482# The default test type (default test) 491# The default test type (default test)
483# The test types may be: 492# The test types may be:
484# build - only build the kernel, do nothing else 493# build - only build the kernel, do nothing else
@@ -530,6 +539,11 @@
530# or on some systems: 539# or on some systems:
531#POST_INSTALL = ssh user@target /sbin/dracut -f /boot/initramfs-test.img $KERNEL_VERSION 540#POST_INSTALL = ssh user@target /sbin/dracut -f /boot/initramfs-test.img $KERNEL_VERSION
532 541
542# If you want to add the kernel entry in Boot Loader Specification (BLS)
543# environment, use kernel-install command.
544# Here's the example:
545#POST_INSTALL = ssh root@Test "/usr/bin/kernel-install add $KERNEL_VERSION /boot/vmlinuz-$KERNEL_VERSION"
546
533# If for some reason you just want to boot the kernel and you do not 547# If for some reason you just want to boot the kernel and you do not
534# want the test to install anything new. For example, you may just want 548# want the test to install anything new. For example, you may just want
535# to boot test the same kernel over and over and do not want to go through 549# to boot test the same kernel over and over and do not want to go through
@@ -593,6 +607,8 @@
593# For REBOOT_TYPE = grub2, you must define both GRUB_MENU and 607# For REBOOT_TYPE = grub2, you must define both GRUB_MENU and
594# GRUB_FILE. 608# GRUB_FILE.
595# 609#
610# For REBOOT_TYPE = grub2bls, you must define GRUB_MENU.
611#
596# For REBOOT_TYPE = syslinux, you must define SYSLINUX_LABEL, and 612# For REBOOT_TYPE = syslinux, you must define SYSLINUX_LABEL, and
597# perhaps modify SYSLINUX (default extlinux) and SYSLINUX_PATH 613# perhaps modify SYSLINUX (default extlinux) and SYSLINUX_PATH
598# (default /boot/extlinux) 614# (default /boot/extlinux)