feat: support 4k sector size disk images#13381
Merged
Merged
Conversation
smira
added
the
integration/misc
There was a problem hiding this comment.
Pull request overview
Adds support for building disk images with a configurable sector size (defaulting to 512 bytes), with an emphasis on enabling 4K-native disk image generation for hardware/virtual disks that present 4096-byte sectors. A new metal-4k built-in profile and corresponding e2e CI matrix entry are introduced, the makefs helpers gain a WithSectorSize option propagated through partition formatting, and the installer threads ImageSectorSize through GPT and blkid probe calls when operating in image mode. The bumped go-blockdevice/v2 v2.0.29 supplies the new gpt.WithFileSectorSize/blkid.WithSectorSize APIs being consumed.
Changes:
- Add
Options.SectorSizetomakefswith implementations for XFS (-s size=), VFAT (-S) and ext4 (-b), plus tests. - Thread
ImageSectorSizethroughimagerprofile, install options, GPT file device creation, blkid probes, and partition format options. - Add
metal-4kdefault profile, testdata fixtures for versions 1.9–1.14 on amd64/arm64, and aWITH_4K_DISK_IMAGEe2e CI lane.
Reviewed changes
Copilot reviewed 35 out of 36 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| pkg/makefs/makefs.go | Adds SectorSize to Options and the WithSectorSize option. |
| pkg/makefs/xfs.go | Passes -s size=<N> when sector size is set. |
| pkg/makefs/xfs_test.go | New test asserting XFS sector size honored. |
| pkg/makefs/vfat.go | Passes -S <N> to mkfs.vfat. |
| pkg/makefs/vfat_test.go | New test asserting VFAT sector size via minfo. |
| pkg/makefs/ext4.go | Maps sector size to -b block size for ext4. |
| pkg/makefs/ext4_test.go | New test asserting ext4 block size via tune2fs. |
| internal/pkg/partition/format.go | Adds SectorSize to FormatOptions, forwards to makefs. |
| pkg/imager/profile/output.go | New DiskSectorSize field on ImageOptions. |
| pkg/imager/profile/default.go | New metal-4k default profile. |
| pkg/imager/profile/testdata/metal-4k-*.yaml | Profile-version testdata fixtures for 4K metal images. |
| pkg/imager/out.go | Passes DiskSectorSize to installer options as ImageSectorSize. |
| cmd/installer/pkg/install/install.go | Plumbs ImageSectorSize into blkid probes, GPT file device, and partition options. |
| hack/test/e2e-qemu.sh | Adds WITH_4K_DISK_IMAGE branch invoking make image-metal-4k. |
| .kres.yaml | Adds e2e-disk-image-4k matrix entry. |
| .github/workflows/*.yaml, .github/renovate.json | Regenerated by kres (workflow header bump, action version bumps, label-gated if, new env). |
| go.mod, go.sum | Bumps go-blockdevice/v2 to v2.0.29 for WithSectorSize/WithFileSectorSize. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
frezbo
approved these changes
May 18, 2026
smira
removed
the
integration/misc
Member
Author
|
There is a broken Canal test, but unrelated to this PR. |
By default, we create still standard 512-bytes sector size images, but optionally sector size can be set to any value. Fixes siderolabs#13227 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
Member
Author
|
/m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
By default, we create still standard 512-bytes sector size images, but optionally sector size can be set to any value.
Fixes #13227