From a378e072021493e163257e706381c27920a21496 Mon Sep 17 00:00:00 2001
From: JarrahG <jarrah.gosbell@TLRcommunications.com.au>
Date: Tue, 17 Dec 2019 18:52:33 +1100
Subject: [PATCH] Support R4.0 method of xen-efi boot

Restore the R4.0 method of booting Xen on EFI. This occurs alongside the
new grub-efi boot mechanism.
---
 kernel.spec.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel.spec.in b/kernel.spec.in
index 895794c..3b300e9 100644
--- a/kernel.spec.in
+++ b/kernel.spec.in
@@ -514,6 +514,12 @@ if [ -f /etc/default/grub ]; then
     fi
 fi
 
+if [ -f /boot/efi/EFI/qubes/xen.cfg ]; then
+    if ! grep -q plymouth.ignore-serial-consoles /boot/efi/EFI/qubes/xen.cfg; then
+        sed -i 's/kernel=.*/& plymouth.ignore-serial-consoles/g' /boot/efi/EFI/qubes/xen.cfg
+    fi
+fi
+
 /bin/kernel-install add %{kernelrelease} /boot/vmlinuz-%{kernelrelease} || exit $?
 
 # Generate legacy boot grub config