From 4a88c520ac332eb39422a30dae98864cae602ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 19 Dec 2019 05:33:34 +0100
Subject: [PATCH] kernel-install: consider both grub2 and grub2-efi configs

Since EFI boot now also use grub2, update its config too when present.

Reported-by: @JarrahG
QubesOS/qubes-issues#4902
---
 system-config/kernel-grub2.install | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system-config/kernel-grub2.install b/system-config/kernel-grub2.install
index 1ffa4ac..84ab9a6 100755
--- a/system-config/kernel-grub2.install
+++ b/system-config/kernel-grub2.install
@@ -19,5 +19,10 @@ case "$COMMAND" in
         ;;
 esac
 if [ -x /usr/sbin/grub2-mkconfig ]; then
-    grub2-mkconfig -o /boot/grub2/grub.cfg
+    if [ -e /boot/grub2/grub.cfg ]; then
+        grub2-mkconfig -o /boot/grub2/grub.cfg
+    fi
+    if [ -e /boot/efi/EFI/qubes/grub.cfg ]; then
+        grub2-mkconfig -o /boot/efi/EFI/qubes/grub.cfg
+    fi
 fi