Skip to content
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

Fix partitioner on disks with secotor size other than 512 #582

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Fix partitioner on disks with secotor size other than 512 #582

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
20 changes: 11 additions & 9 deletions pkg/partitioner/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
switch partType {
case v1.GPT:
table = &gpt.Table{
ProtectiveMBR: true,
GUID: cnst.DiskUUID, // Set know predictable UUID
Partitions: kairosPartsToDiskfsGPTParts(parts, d.Size),
ProtectiveMBR: true,
GUID: cnst.DiskUUID, // Set know predictable UUID
Partitions: kairosPartsToDiskfsGPTParts(parts, d.Size, d.LogicalBlocksize),
LogicalSectorSize: int(d.LogicalBlocksize),
PhysicalSectorSize: int(d.PhysicalBlocksize),
}
default:
return fmt.Errorf("invalid partition type: %s", partType)
Expand All @@ -39,19 +41,19 @@
return nil
}

func getSectorEndFromSize(start, size uint64) uint64 {
return (size / uint64(diskfs.SectorSize512)) + start - 1
func getSectorEndFromSize(start, size uint64, sectorSize int64) uint64 {
return (size / uint64(sectorSize)) + start - 1
Dismissed Show dismissed Hide dismissed
}

func kairosPartsToDiskfsGPTParts(parts sdkTypes.PartitionList, diskSize int64) []*gpt.Partition {
func kairosPartsToDiskfsGPTParts(parts sdkTypes.PartitionList, diskSize int64, sectorSize int64) []*gpt.Partition {
var partitions []*gpt.Partition
for index, part := range parts {
var start uint64
var end uint64
var size uint64
if len(partitions) == 0 {
// first partition, align to 1Mb
start = 1024 * 1024 / uint64(diskfs.SectorSize512)
start = 1024 * 1024 / uint64(sectorSize)
Dismissed Show dismissed Hide dismissed
} else {
// get latest partition end, sum 1
start = partitions[len(partitions)-1].End + 1
Expand All @@ -78,7 +80,7 @@

}

end = getSectorEndFromSize(start, size)
end = getSectorEndFromSize(start, size, sectorSize)

if part.Name == cnst.EfiPartName && part.FS == cnst.EfiFs {
// EFI boot partition
Expand Down Expand Up @@ -127,7 +129,7 @@
}

func NewDisk(device string, opts ...DiskOptions) (*Disk, error) {
d, err := diskfs.Open(device, diskfs.WithSectorSize(512))
d, err := diskfs.Open(device)
if err != nil {
return nil, err
}
Expand Down