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