aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGravatar Vivien Didelot <vivien.didelot@savoirfairelinux.com>2015-08-11 17:23:50 -0400
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-08-18 21:42:51 +0200
commit7a691d08e397f212b2d1adfabaee6b0b3eeefac6 (patch)
tree319e45599e7d74eef5c5ea929af8660203bce965 /fs
parent8d3e126e8303d9db52b3f0030d07bd337c6c660a (diff)
downloadbuildroot-7a691d08e397f212b2d1adfabaee6b0b3eeefac6.tar.gz
buildroot-7a691d08e397f212b2d1adfabaee6b0b3eeefac6.tar.bz2
fs: iso9660: change boot menu entry text
Replace Grub-specific "menu.lst" with "menu config" in the BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU Kconfig entry text, and mention missing grub.cfg for Grub 2. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/iso9660/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 7e1ddd64ff..2482e44e31 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -47,13 +47,14 @@ config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
endchoice
config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
- string "Boot menu.lst file"
+ string "Boot menu config file"
default "fs/iso9660/menu.lst" if BR2_TARGET_ROOTFS_ISO9660_GRUB
default "fs/iso9660/grub.cfg" if BR2_TARGET_ROOTFS_ISO9660_GRUB2
default "fs/iso9660/isolinux.cfg" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
help
Use this option to provide a custom bootloader configuration
- file (menu.lst for Grub, isolinux.cfg for isolinux).
+ file (menu.lst for Grub, grub.cfg for Grub 2, isolinux.cfg for
+ isolinux).
Note that the strings __KERNEL_PATH__ and __INITRD_PATH__
will automatically be replaced by the path to the kernel and