rpms/lorax-templates-rhel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop macboot.img and simplify efiboot.img use

Browse Source 
Apple hardware doesn't need the macboot.img to boot, efiboot.img is not
needed in the filesystem so do not graft it into it.

Remove macboot.img and apple specific EFI support
This commit is contained in:
Brian C. Lane 2022-04-13 13:42:49 -07:00 committed by Stephen Gallagher
parent 12c0368018
commit 3ec83abf28
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
80-rhel/efi.tmpl
View File

@ -21,9 +21,6 @@ install boot/grub2/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
## actually make the EFI images ## actually make the EFI images
${make_efiboot("images/efiboot.img")} ${make_efiboot("images/efiboot.img")}
%if domacboot:
${make_efiboot("images/macboot.img", imgtype="apple")}
%endif
## This is kinda gross, but then... so's EFI. ## This is kinda gross, but then... so's EFI.
<%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')"> <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')">
@ -32,7 +29,6 @@ ${make_efiboot("images/efiboot.img")}
eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) eficonf = "%s/grub.cfg" % (EFIBOOTDIR, )
args = "--label=ANACONDA --debug" args = "--label=ANACONDA --debug"
if disk: args += " --disk" if disk: args += " --disk"
if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version)
%> %>
%if include_kernel: %if include_kernel:
copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}

10
80-rhel/x86.tmpl
View File

@ -87,17 +87,7 @@ treeinfo images-${basearch} eltorito.img images/eltorito.img
%if (efiarch32 or efiarch64) and basearch != 'i386': %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", "-isohybrid-gpt-basdat")]
if domacboot:
images.append(("images/macboot.img", "-isohybrid-gpt-hfsplus"))
%> %>
%for img, hybrid in images:
<%
efiargs += " --efi-boot {0} {1}".format(img, hybrid)
efigraft += " {0}={1}/{0}".format(img,outroot)
%>
treeinfo images-${basearch} ${img|basename} ${img}
%endfor
<%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
%endif %endif