From 275ab6419894d82689afb0418342595713cb6b88 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Nov 2024 18:06:12 +0100 Subject: [PATCH] disk: update for new MinSize type --- pkg/disk/disk_test.go | 4 ++-- pkg/disk/partition_table.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/disk/disk_test.go b/pkg/disk/disk_test.go index 0f6d9d2787..ff92d09415 100644 --- a/pkg/disk/disk_test.go +++ b/pkg/disk/disk_test.go @@ -146,7 +146,7 @@ func blueprintApplied(pt *disk.PartitionTable, bp []blueprint.FilesystemCustomiz } for idx, ent := range path { if sz, ok := ent.(disk.Sizeable); ok { - if sz.GetSize() < mnt.MinSize { + if sz.GetSize() < mnt.MinSize.Uint64() { return fmt.Errorf("entity %d in the path from %s is smaller (%d) than the requested minsize %d", idx, mnt.Mountpoint, sz.GetSize(), mnt.MinSize) } } @@ -178,7 +178,7 @@ func TestCreatePartitionTable(t *testing.T) { sumSizes := func(bp []blueprint.FilesystemCustomization) (sum uint64) { for _, mnt := range bp { - sum += mnt.MinSize + sum += mnt.MinSize.Uint64() } return sum } diff --git a/pkg/disk/partition_table.go b/pkg/disk/partition_table.go index 9bed8eb611..5407bf86fe 100644 --- a/pkg/disk/partition_table.go +++ b/pkg/disk/partition_table.go @@ -428,7 +428,7 @@ func (pt *PartitionTable) applyCustomization(mountpoints []blueprint.FilesystemC newMountpoints := []blueprint.FilesystemCustomization{} for _, mnt := range mountpoints { - size := clampFSSize(mnt.Mountpoint, mnt.MinSize) + size := clampFSSize(mnt.Mountpoint, mnt.MinSize.Uint64()) if path := entityPath(pt, mnt.Mountpoint); len(path) != 0 { size = alignEntityBranch(path, size) resizeEntityBranch(path, size)