From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 16 Apr 2020 18:53:05 +0200 Subject: [PATCH] 10_linux.in: Enable BLS configuration if new-kernel-pkg isn't present Currently if the the GRUB_ENABLE_BLSCFG option in /etc/default/grub hasn't been set, the 10_linux script will generate a GRUB configuration that does not include the blscfg command to populate the menu entries from BLS files. But on kernel install the /usr/lib/kernel/install.d/20-grub.install script will only add menuentry commands to the GRUB config file if the old grubby tool and new-kernel-pkg script are installed. So a configuration with the GRUB_ENABLE_BLSCFG option will lead to a setup where new kernel entries are not added. Make a BLS config the default if that option wasn't set and the new-kernel-pkg script is not present. Signed-off-by: Javier Martinez Canillas --- util/grub.d/10_linux.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index c72cc3246bb..847646bd8a8 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -164,6 +164,11 @@ populate_menu() printf "$menu" } +# Make BLS the default if GRUB_ENABLE_BLSCFG was not set and grubby is not installed. +if [ -z "${GRUB_ENABLE_BLSCFG}" ] && [ -z "$(which new-kernel-pkg 2> /dev/null)" ]; then + GRUB_ENABLE_BLSCFG="true" +fi + if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then if [ x$dirname = x/ ]; then if [ -z "${prepare_root_cache}" ]; then