Ack. Peter Jones wrote:
Basically revert c5fcb418, but use ${brandpkgname}-logos instead of system-logos, so we don't have to rely on it being noarch. --- scripts/mk-images.efi | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi index e3c1f47..5f13eda 100644 --- a/scripts/mk-images.efi +++ b/scripts/mk-images.efi @@ -157,8 +157,13 @@ 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- yumdownloader -c $yumconf ${brandpkgname}-logos- rpm2cpio ${brandpkgname}-logos.noarch.rpm | (cd $KERNELROOT; cpio --quiet -iumd) + artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1) + if [ -z "$artpkg" ]; then + argpkg="generic-logos" + fi + + yumdownloader -c ${yumconf} ${artpkg} + rpm2cpio ${artpkg} | (cd $KERNELROOT; cpio --quiet -iumd) cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz }
-- David Cantrell <dcantrell@xxxxxxxxxx> Red Hat / Honolulu, HI _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
