From 4df7a6516df0f06f8a083a19943ec079d97bfdf2 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 12 Aug 2008 11:01:36 -0400
Subject: Catch the first non-generic-logo package that provides system-logos.

---
 scripts/mk-images.efi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index b891b9c48..23038eb35 100755
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -154,7 +154,12 @@ prepareEfiTree() {
     mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi
     mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf
 
-    artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" -c $yumconf system-logos)
+    artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides system-logos | grep -v generic-logos | head -1)
+
+    if [ -z "$artpkg" ]; then
+       argpkg="generic-logos"
+    fi
+
     yumdownloader -c $yumconf $artpkg
     rpm2cpio $artpkg.rpm | (cd $KERNELROOT; cpio --quiet -iumd)
     cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz
-- 
cgit