From 9b7667c3a57c60655f42ba194d6d1818d0bbb436 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Ouellet <jpo@vt.edu>
Date: Fri, 11 Nov 2016 16:22:23 -0500
Subject: [PATCH] Ignore EFI boot args when parsing for filename

I need to set some flags in order to boot as described here:
https://www.qubes-os.org/doc/uefi-troubleshooting/

My settings look like this:
    $ efibootmgr -v
    BootCurrent: 0000
    Boot0000* Qubes HD(...)/File(\EFI\qubes\xen.efi)p.l.a.c.e.h.o...

which causes awk to get confused and think my $EFI_DIR should be:
    /EFI/qubesp.l.a.c.e.h.o.l.d.e.r. ./.m.a.p.b.s. ./.n.o.e.x.i.t.b.o.o.t.

This causes the script to later bail:
    if [ ! -d "$EFI_DIR" ]; then
        # non-EFI system
        exit 0;
    fi

So my xen.cfg did not get new entries when installing dom0 kernel packages.
---
 system-config/kernel-xen-efi.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system-config/kernel-xen-efi.install b/system-config/kernel-xen-efi.install
index 07ce066..842eac3 100755
--- a/system-config/kernel-xen-efi.install
+++ b/system-config/kernel-xen-efi.install
@@ -12,7 +12,7 @@ EFI_DIR=$(efibootmgr -v 2>/dev/null | awk '
         /^Boot....\* / { 
             if ("Boot" current "*" == $1) {
                 sub(".*File\\(", "");
-                sub("\\\\xen.efi\\)", "");
+                sub("\\\\xen.efi\\).*", "");
                 gsub("\\\\", "/");
                 print;
             }