almalinux/lorax
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't try to build efi images for basearch=i386.

Browse Source 
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 <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-01-26 10:45:47 -05:00 committed by Brian C. Lane
parent 68d1f4208d
commit 6b0b624638
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/templates.d/99-generic/live/x86.tmpl
View File

@ -76,7 +76,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if exists("boot/efi/EFI/*/gcdx64.efi"): %if exists("boot/efi/EFI/*/gcdx64.efi"):
<% efiarch64 = 'X64' %> <% efiarch64 = 'X64' %>
%endif %endif
%if efiarch32 or efiarch64: %if efiarch32 or efiarch64 and basearch != 'i386':
<% <%
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]

2
share/templates.d/99-generic/x86.tmpl
View File

@ -78,7 +78,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if exists("boot/efi/EFI/*/gcdx64.efi"): %if exists("boot/efi/EFI/*/gcdx64.efi"):
<% efiarch64 = 'X64' %> <% efiarch64 = 'X64' %>
%endif %endif
%if efiarch32 or efiarch64: %if efiarch32 or efiarch64 and basearch != 'i386':
<% <%
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]