From e863360d2e620d8f505b3c09d78568cc8ec02510 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 11 Sep 2012 17:22:06 -0700
Subject: [PATCH] we need grub2-efi and shim for UEFI installs now, not
 grub-efi (f18/f19)

---
 comps-f18.xml.in | 3 ++-
 comps-f19.xml.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 76b9dc4a..7c90401f 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -946,8 +946,8 @@
       <packagereq>fcoe-utils</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>grub</packagereq>
-      <packagereq>grub-efi</packagereq>
       <packagereq>grub2</packagereq>
+      <packagereq>grub2-efi</packagereq>
       <packagereq>hfsplus-tools</packagereq>
       <packagereq>iscsi-initiator-utils</packagereq>
       <packagereq>lvm2</packagereq>
@@ -957,6 +957,7 @@
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>s390utils</packagereq>
       <packagereq>s390utils-base</packagereq>
+      <packagereq>shim</packagereq>
       <packagereq>silo</packagereq>
       <packagereq>system-config-firewall-base</packagereq>
       <packagereq>tboot</packagereq>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 4e92679b..98b5a92b 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -946,8 +946,8 @@
       <packagereq>fcoe-utils</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>grub</packagereq>
-      <packagereq>grub-efi</packagereq>
       <packagereq>grub2</packagereq>
+      <packagereq>grub2-efi</packagereq>
       <packagereq>hfsplus-tools</packagereq>
       <packagereq>iscsi-initiator-utils</packagereq>
       <packagereq>lvm2</packagereq>
@@ -957,6 +957,7 @@
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>s390utils</packagereq>
       <packagereq>s390utils-base</packagereq>
+      <packagereq>shim</packagereq>
       <packagereq>silo</packagereq>
       <packagereq>system-config-firewall-base</packagereq>
       <packagereq>tboot</packagereq>