dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0147-Include-OSTree-path-when-searching-kernels-images-if.patch

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