Skip to content

Dynamically size ESP partition to support images > 512MB #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexhulbert wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −7
Open

Dynamically size ESP partition to support images > 512MB #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions mkosi.profiles/gcp/mkosi.postoutput
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@ cp ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.efi ${OUTPUTDIR}/esp/EFI/BOOT/BOOTX
find ${OUTPUTDIR}/esp -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
rm -f ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw

# Hack to use the newer systemd-repart from nix instead of mkosi.tools one
# TODO: remove after updating mkosi
PATH="${PATH#/usr/bin:/usr/sbin:}" systemd-repart --empty=create \
--size=1G \
--definitions=mkosi.profiles/gcp/repart.d \
# Dynamically size ESP partition and disk from EFI file
MIB=$((1024 * 1024))
EFI_BYTES=$(stat -c%s "${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.efi")
ESP_BYTES=$(( EFI_BYTES + 32 * MIB ))
DISK_GIB=$(numfmt --to-unit=1Gi --round=up $(( ESP_BYTES + MIB ))) # + 1MiB GPT overhead

REPART_TMPDIR=$(mktemp -d)
cp mkosi.profiles/gcp/repart.d/00-uki.conf "${REPART_TMPDIR}/00-uki.conf"
echo "SizeMinBytes=${ESP_BYTES}" >> "${REPART_TMPDIR}/00-uki.conf"
echo "SizeMaxBytes=${ESP_BYTES}" >> "${REPART_TMPDIR}/00-uki.conf"

systemd-repart --empty=create \
--size=${DISK_GIB}G \
--definitions="${REPART_TMPDIR}" \
--copy-source=${OUTPUTDIR} \
--seed=630b5f72-a36a-4e83-b23d-6ef47c82fd9c \
--dry-run=no \
Expand Down
2 changes: 0 additions & 2 deletions mkosi.profiles/gcp/repart.d/00-uki.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ Format=vfat
CopyFiles=/esp:/
Minimize=off
UUID=87654321-4321-8765-4321-876543218765
SizeMinBytes=524288000
SizeMaxBytes=524288000