particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disk: ensure there is enough space for all parts

Browse source 
The old calculation was wrong since it compared sectors and bytes.
This commit is contained in:
Christian Kellner 2021-12-20 15:43:11 +01:00 • committed by Tom Gundersen
parent 6db5a7d6a8
commit 16ad1211c3
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/disk/customizations.go
View file

@ -46,15 +46,9 @@ func CreatePartitionTable(
}
}
if tableSize := table.getPartitionTableSize(); imageSize < tableSize {
imageSize = tableSize
}
table.Size = imageSize
// start point for all of the arches is
// 2048 sectors.
var start uint64 = table.updatePartitionStartPointOffsets(2048)
var start uint64 = table.updatePartitionStartPointOffsets(2048, imageSize)
// treat the root partition as a special case
// by setting the size dynamically

30
internal/disk/disk.go
View file

@ -313,10 +313,11 @@ func (pt *PartitionTable) GenerateUUIDs(rng *rand.Rand) {
}
}
// dynamically calculate and update the start point
// for each of the existing partitions
// return the updated start point
func (pt *PartitionTable) updatePartitionStartPointOffsets(start uint64) uint64 {
// Dynamically calculate and update the start point for each of the existing
// partitions. Adjusts the overall size of image to either the supplied
// value in `size` or to the sum of all partitions if that is lager.
// Returns the updated start point.
func (pt *PartitionTable) updatePartitionStartPointOffsets(start, size uint64) uint64 {
var rootIdx = -1
for i := range pt.Partitions {
partition := &pt.Partitions[i]
@ -327,16 +328,21 @@ func (pt *PartitionTable) updatePartitionStartPointOffsets(start uint64) uint64
partition.Start = start
start += partition.Size
}
pt.Partitions[rootIdx].Start = start
return start
}
func (pt *PartitionTable) getPartitionTableSize() uint64 {
var size uint64
for _, p := range pt.Partitions {
size += p.Size
root := &pt.Partitions[rootIdx]
root.Start = start
// If the sum of all partitions is bigger then the specified size,
// we use that instead. Grow the partition table size if needed.
if sum := pt.SectorsToBytes(root.Start + root.Size); sum > size {
size = sum
}
return size
if size > pt.Size {
pt.Size = size
}
return start
}
// Ensure the partition has at least the given size. Will do nothing