github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 20:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix raw efi build image size calculation (#4097)

Browse Source 
fixes #4095

Signed-off-by: Chris Irrgang <chris.irrgang@gmx.de>
This commit is contained in:
Chris Irrgang
2025-01-27 09:26:18 +01:00
committed by GitHub
parent 9398785bec
commit fd6839d0fe
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/linuxkit/moby/build/images.yaml
View File

@@ -3,7 +3,7 @@
iso-efi: linuxkit/mkimage-iso-efi:4bff02040897e4177a2220038f4a5a08cd556afd iso-efi: linuxkit/mkimage-iso-efi:4bff02040897e4177a2220038f4a5a08cd556afd
iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:6d087ae7aa61fe6d840e314dcb2d6b7b2a5db1b8 iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:6d087ae7aa61fe6d840e314dcb2d6b7b2a5db1b8
raw-bios: linuxkit/mkimage-raw-bios:c64318cfc28b39010b05c7cd48673f397c45c8df raw-bios: linuxkit/mkimage-raw-bios:c64318cfc28b39010b05c7cd48673f397c45c8df
raw-efi: linuxkit/mkimage-raw-efi:8bc9d4afbbd5b01488a8c699b3db721484a9eda1 raw-efi: linuxkit/mkimage-raw-efi:6d9a9ff0a575f8ba5fcd5bf25feac89d0aa343d0
squashfs: linuxkit/mkimage-squashfs:d9de62071bed575377e35e944004bcb23c50afab squashfs: linuxkit/mkimage-squashfs:d9de62071bed575377e35e944004bcb23c50afab
gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
qcow2-efi: linuxkit/mkimage-qcow2-efi:64e1921dc6074d55d0fa95c2beddef7d153d3eca qcow2-efi: linuxkit/mkimage-qcow2-efi:64e1921dc6074d55d0fa95c2beddef7d153d3eca

28
tools/mkimage-raw-efi/make-efi
View File

@@ -55,30 +55,42 @@ menuentry 'LinuxKit ISO Image' {
} }
EOF EOF
# # FAT filesystem config
FAT_SIZE=32
SECTOR_SIZE=512
SECTORS_PER_CLUSTER=8
# these always include the Boot Sector and FS Information Sector (sector 0 and 1) among others for FAT32
RESERVED_SECTORS=32
# calculate sizes # calculate sizes
KERNEL_FILE_SIZE=$(stat -c %s "$KERNEL") KERNEL_FILE_SIZE=$(stat -c %s "$KERNEL")
INITRD_FILE_SIZE=$(stat -c %s "$INITRD") INITRD_FILE_SIZE=$(stat -c %s "$INITRD")
EFI_FILE_SIZE=$(stat -c %s "$BOOTFILE") EFI_FILE_SIZE=$(stat -c %s "$BOOTFILE")
# minimum headroom needed in ESP, in bytes GRUB_FILE_SIZE=$(stat -c %s EFI/BOOT/grub.cfg)
# 511KiB headroom seems to be enough
ESP_HEADROOM=$(( 1024 * 1024 ))
# this is the minimum size of our EFI System Partition # this is the minimum size of our EFI System Partition
ESP_FILE_SIZE=$(( $KERNEL_FILE_SIZE + $INITRD_FILE_SIZE + $EFI_FILE_SIZE + $ESP_HEADROOM )) ESP_DATA_SIZE=$(( $KERNEL_FILE_SIZE + $INITRD_FILE_SIZE + $EFI_FILE_SIZE + $GRUB_FILE_SIZE ))
ESP_DATA_SECTORS=$(( $ESP_DATA_SIZE / $SECTOR_SIZE ))
# File Allocation Table Sectors = (clusters + 2) * bytes per cluster / sector size
FILE_ALLOCATION_TABLE_SECTORS=$(( ( $ESP_DATA_SECTORS / $SECTORS_PER_CLUSTER + 2 ) * ( $FAT_SIZE / 8 ) / $SECTOR_SIZE ))
# there are two file allocation tables hence 2 * $FILE_ALLOCATION_TABLE_SECTORS
FAT_OVERHEAD_SECTORS=$(( $RESERVED_SECTORS + ( 2 * $FILE_ALLOCATION_TABLE_SECTORS ) ))
FAT_OVERHEAD_SIZE=$(( $FAT_OVERHEAD_SECTORS * $SECTOR_SIZE ))
# (x+1024)/1024*1024 rounds up to multiple of 1024KB, or 2048 sectors # (x+1024)/1024*1024 rounds up to multiple of 1024KB, or 2048 sectors
# some firmwares get confused if the partitions are not aligned on 2048 blocks # some firmwares get confused if the partitions are not aligned on 2048 blocks
# we will round up to the nearest multiple of 2048 blocks # we will round up to the nearest multiple of 2048 blocks
# since each block is 512 bytes, we want the size to be a multiple of # since each block is 512 bytes, we want the size to be a multiple of
# 2048 blocks * 512 bytes = 1048576 bytes = 1024KB # 2048 blocks * 512 bytes = 1048576 bytes = 1024KB
ESP_FILE_SIZE_KB=$(( ( ( ($ESP_FILE_SIZE+1024-1) / 1024 ) + 1024-1) / 1024 * 1024 )) ESP_FILE_SIZE_KB=$(( ( ( ($ESP_DATA_SIZE + $FAT_OVERHEAD_SIZE + 1024 - 1) / 1024 ) + 1024 - 1) / 1024 * 1024 ))
# and for sectors # and for sectors
ESP_FILE_SIZE_SECTORS=$(( $ESP_FILE_SIZE_KB * 2 )) ESP_FILE_SIZE_SECTORS=$(( $ESP_FILE_SIZE_KB * 1024 / $SECTOR_SIZE ))
# create a raw disk with an EFI boot partition # create a raw disk with an EFI boot partition
# Stuff it into a FAT filesystem, making it as small as possible. # Stuff it into a FAT filesystem, making it as small as possible.
mkfs.vfat -v -C $ESP_FILE $(( $ESP_FILE_SIZE_KB )) > /dev/null mkfs.vfat -v -F $FAT_SIZE -S $SECTOR_SIZE -s $SECTORS_PER_CLUSTER -R $RESERVED_SECTORS -C $ESP_FILE $(( $ESP_FILE_SIZE_KB )) > /dev/null
echo "mtools_skip_check=1" >> /etc/mtools.conf && \ echo "mtools_skip_check=1" >> /etc/mtools.conf && \
mmd -i $ESP_FILE ::/EFI mmd -i $ESP_FILE ::/EFI
mmd -i $ESP_FILE ::/EFI/BOOT mmd -i $ESP_FILE ::/EFI/BOOT