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

disk: createPartition now appends also it

Browse source 
It makes sense that the function that creates the partition also
adds it to the partition table.
This commit is contained in:
Christian Kellner 2021-11-10 15:30:49 +01:00 • committed by Tom Gundersen
parent 147e0c966b
commit 5693045916
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/disk/customizations.go
View file

@ -40,8 +40,7 @@ func CreatePartitionTable(
for _, m := range mountpoints {
if m.Mountpoint != "/" {
partitionSize := m.MinSize / sectorSize
partition := basePartitionTable.createPartition(m.Mountpoint, partitionSize, rng)
basePartitionTable.Partitions = append(basePartitionTable.Partitions, partition)
basePartitionTable.createPartition(m.Mountpoint, partitionSize, rng)
}
}
@ -64,7 +63,7 @@ func CreatePartitionTable(
return basePartitionTable
}
func (pt *PartitionTable) createPartition(mountpoint string, size uint64, rng *rand.Rand) Partition {
func (pt *PartitionTable) createPartition(mountpoint string, size uint64, rng *rand.Rand) {
filesystem := Filesystem{
Type: "xfs",
UUID: uuid.Must(newRandomUUIDFromReader(rng)).String(),
@ -73,18 +72,18 @@ func (pt *PartitionTable) createPartition(mountpoint string, size uint64, rng *r
FSTabFreq: 0,
FSTabPassNo: 0,
}
if pt.Type != "gpt" {
return Partition{
Size: size,
Filesystem: &filesystem,
}
}
return Partition{
partition := Partition{
Size: size,
Type: FilesystemDataGUID,
UUID: uuid.Must(newRandomUUIDFromReader(rng)).String(),
Filesystem: &filesystem,
}
if pt.Type == "gpt" {
partition.Type = FilesystemDataGUID
partition.UUID = uuid.Must(newRandomUUIDFromReader(rng)).String()
}
pt.Partitions = append(pt.Partitions, partition)
}
func newRandomUUIDFromReader(r io.Reader) (uuid.UUID, error) {