dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-06-24 08:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13624 from chris-crone/mkfs-erofs-4k

Browse Source 
erofs: align default mkfs block size across platforms
This commit is contained in:
Derek McGowan
2026-06-18 21:13:54 +00:00
committed by GitHub
parent b6aca07dd5 773d3517dd
commit bfc75a4bc4
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/erofsutils/mount.go
View File

@@ -123,10 +123,6 @@ func GenerateTarIndexAndAppendTar(ctx context.Context, r io.Reader, layerPath, u
// AddDefaultMkfsOpts adds default options for mkfs.erofs
func AddDefaultMkfsOpts(mkfsExtraOpts []string) []string {
if runtime.GOOS != "darwin" {
return mkfsExtraOpts
}
// Check if -b argument is already present
for _, opt := range mkfsExtraOpts {
if strings.HasPrefix(opt, "-b") {
@@ -134,8 +130,7 @@ func AddDefaultMkfsOpts(mkfsExtraOpts []string) []string {
}
}
// Add -b4096 as the first option to prevent unusable block
// size from being used on macOS.
// Default to a 4K block size so images mount on any page size.
return append([]string{"-b4096"}, mkfsExtraOpts...)
}