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

Reduce the size of macboot.img (#952747)

Browse Source 
The size estimate was counting the /EFI/BOOT/ contents twice and then
doubling that. Only count things once, then double it for the
System/Library/CoreServices/ copy.

hard-links don't work. With CoreServices hardlinked to /EFI/BOOT/ the
Mac won't boot. With /EFI/BOOT/ hardlinked to CoreServices grub2 cannot
read the config file so there are 2 real copies.

This reduces the image size from 21M to about 12M
This commit is contained in:
Brian C. Lane 2015-10-02 10:51:12 -07:00
parent 15d44ce562
commit d282f1fa8c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sbin/mkefiboot
View File

@ -40,8 +40,8 @@ def mkmacboot(bootdir, outfile, label, icon=None, product='Generic',
graft['.VolumeIcon.icns'] = icon graft['.VolumeIcon.icns'] = icon
if diskname and os.path.exists(diskname): if diskname and os.path.exists(diskname):
graft['EFI/BOOT/.disk_label'] = diskname graft['EFI/BOOT/.disk_label'] = diskname
# everything winds up bein there twice... # shim and grub2 are in 2 places so double the estimate
size = estimate_size(bootdir, graft=graft) * 2 size = estimate_size(None, graft=graft) * 2
mkhfsimg(None, outfile, label=label, graft=graft, size=size) mkhfsimg(None, outfile, label=label, graft=graft, size=size)
macmunge(outfile, product) macmunge(outfile, product)
@ -81,9 +81,13 @@ def macmunge(imgfile, product):
</dict> </dict>
</plist> </plist>
''' % (product,)) ''' % (product,))
# NOTE: OSX won't boot if we hardlink to /EFI/BOOT and grub2
# can't read the config file if we hardlink the other direction
# So copy the files.
shutil.copy(shim, os.path.join(sysdir,'boot.efi')) shutil.copy(shim, os.path.join(sysdir,'boot.efi'))
shutil.copy(loader, sysdir) shutil.copy(loader, sysdir)
shutil.copy(config, sysdir) shutil.copy(config, sysdir)
# format data properly (big-endian UInt32) # format data properly (big-endian UInt32)
nodedata = struct.pack(">i", blessnode) nodedata = struct.pack(">i", blessnode)
dirdata = struct.pack(">i", dirnode) dirdata = struct.pack(">i", dirnode)