From 459eaeacbb40116dcb501cf165c7816e70c66fb3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 24 Apr 2018 02:28:04 +0200 Subject: [PATCH 236/236] Include OSTree path when searching kernels images if BLS config is enabled The OSTree based distros (i.e: Fedora Atomic) don't install kernel images in the /boot directory, but in /boot/ostree. So the 10_linux script isn't able to include these kernels in its list, so the linux_entry() function is never called. This isn't a problem since the 10_linux script isn't used to populate the menu entries anyways, but instead a custom 15_ostree script is used. But for BLS we want the 10_linux script to generate the minimal grub.cfg that calls the blscfg command, so add the OSTree kernel images to the list. Signed-off-by: Javier Martinez Canillas --- util/grub.d/10_linux.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index c2ffc77398f..15ba8eff8a6 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -250,6 +250,12 @@ case "x$machine" in done ;; esac +if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then + for i in /boot/ostree/*/vmlinuz-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done +fi + case "$machine" in i?86) GENKERNEL_ARCH="x86" ;; mips|mips64) GENKERNEL_ARCH="mips" ;; -- 2.15.0