From 6b0b624638c2d8261d59fba9ffcbe40a7f712c85 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 26 Jan 2018 10:45:47 -0500 Subject: [PATCH] Don't try to build efi images for basearch=i386. This shouldn't have been turned on when we switched to doing ia32-efi images on x86_64; just having the file available isn't where we want that policy decision to be. Resolves: rhbz#1539085 Signed-off-by: Peter Jones --- share/templates.d/99-generic/live/x86.tmpl | 2 +- share/templates.d/99-generic/x86.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/templates.d/99-generic/live/x86.tmpl b/share/templates.d/99-generic/live/x86.tmpl index c68cd136..211001a6 100644 --- a/share/templates.d/99-generic/live/x86.tmpl +++ b/share/templates.d/99-generic/live/x86.tmpl @@ -76,7 +76,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if exists("boot/efi/EFI/*/gcdx64.efi"): <% efiarch64 = 'X64' %> %endif -%if efiarch32 or efiarch64: +%if efiarch32 or efiarch64 and basearch != 'i386': <% efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) images = ["images/efiboot.img"] diff --git a/share/templates.d/99-generic/x86.tmpl b/share/templates.d/99-generic/x86.tmpl index ca23c377..0fd0bbfe 100644 --- a/share/templates.d/99-generic/x86.tmpl +++ b/share/templates.d/99-generic/x86.tmpl @@ -78,7 +78,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if exists("boot/efi/EFI/*/gcdx64.efi"): <% efiarch64 = 'X64' %> %endif -%if efiarch32 or efiarch64: +%if efiarch32 or efiarch64 and basearch != 'i386': <% efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) images = ["images/efiboot.img"]