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

disk: rename Partition.Filesystem to Payload

Browse source 
A Partition can contain any type of Entity now.  Before we change the
type, rename the field to a more generic term.
This commit is contained in:
Achilleas Koutsou 2022-02-08 14:50:50 +01:00 • committed by Tom Gundersen
parent 221cdedebc
commit 54fd090a60
16 changed files with 172 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

28
internal/disk/partition.go
View file

@ -11,11 +11,13 @@ type Partition struct {
Size uint64 // Size of the partition in bytes
Type string // Partition type, e.g. 0x83 for MBR or a UUID for gpt
Bootable bool // `Legacy BIOS bootable` (GPT) or `active` (DOS) flag
// ID of the partition, dos doesn't use traditional UUIDs, therefore this
// is just a string.
UUID string
// If nil, the partition is raw; It doesn't contain a filesystem.
Filesystem *Filesystem
// If nil, the partition is raw; It doesn't contain a payload.
Payload *Filesystem
}
func (p *Partition) IsContainer() bool {
@ -27,7 +29,7 @@ func (p *Partition) Clone() Entity {
return p
}
ent := p.Filesystem.Clone()
ent := p.Payload.Clone()
var fs *Filesystem
if ent != nil {
fsEnt, cloneOk := ent.(*Filesystem)
@ -38,20 +40,20 @@ func (p *Partition) Clone() Entity {
}
return &Partition{
Start: p.Start,
Size: p.Size,
Type: p.Type,
Bootable: p.Bootable,
UUID: p.UUID,
Filesystem: fs,
Start: p.Start,
Size: p.Size,
Type: p.Type,
Bootable: p.Bootable,
UUID: p.UUID,
Payload: fs,
}
}
// Converts Partition to osbuild.QEMUPartition that encodes the same partition.
func (p *Partition) QEMUPartition() osbuild.QEMUPartition {
var fs *osbuild.QEMUFilesystem
if p.Filesystem != nil {
f := p.Filesystem.QEMUFilesystem()
if p.Payload != nil {
f := p.Payload.QEMUFilesystem()
fs = &f
}
return osbuild.QEMUPartition{
@ -65,7 +67,7 @@ func (p *Partition) QEMUPartition() osbuild.QEMUPartition {
}
func (pt *Partition) GetItemCount() uint {
if pt.Filesystem == nil {
if pt.Payload == nil {
return 0
}
return 1
@ -75,7 +77,7 @@ func (p *Partition) GetChild(n uint) Entity {
if n != 0 {
panic(fmt.Sprintf("invalid child index for Partition: %d != 0", n))
}
return p.Filesystem
return p.Payload
}
func (p *Partition) GetSize() uint64 {