This commit fixes #2347 by ensuring that a minimum size of 1GB is set for all file systems. The only exception to this is the `/usr` which is set to 2GB, since this was the only mountpoint that was previously being checked.
471 lines
11 KiB
Go
471 lines
11 KiB
Go
package disk
|
|
|
|
import (
|
|
"fmt"
|
|
"math/rand"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/osbuild/osbuild-composer/internal/blueprint"
|
|
)
|
|
|
|
type PartitionTable struct {
|
|
Size uint64 // Size of the disk (in bytes).
|
|
UUID string // Unique identifier of the partition table (GPT only).
|
|
Type string // Partition table type, e.g. dos, gpt.
|
|
Partitions []Partition
|
|
|
|
SectorSize uint64 // Sector size in bytes
|
|
ExtraPadding uint64 // Extra space at the end of the partition table (sectors)
|
|
}
|
|
|
|
func NewPartitionTable(basePT *PartitionTable, mountpoints []blueprint.FilesystemCustomization, imageSize uint64, rng *rand.Rand) (*PartitionTable, error) {
|
|
newPT := basePT.Clone().(*PartitionTable)
|
|
for _, mnt := range mountpoints {
|
|
size := newPT.AlignUp(clampFSSize(mnt.Mountpoint, mnt.MinSize))
|
|
if path := entityPath(newPT, mnt.Mountpoint); len(path) != 0 {
|
|
resizeEntityBranch(path, size)
|
|
} else {
|
|
if err := newPT.createFilesystem(mnt.Mountpoint, size); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
}
|
|
|
|
// Calculate partition table offsets and sizes
|
|
newPT.relayout(imageSize)
|
|
|
|
// Generate new UUIDs for filesystems and partitions
|
|
newPT.GenerateUUIDs(rng)
|
|
|
|
return newPT, nil
|
|
}
|
|
|
|
func (pt *PartitionTable) IsContainer() bool {
|
|
return true
|
|
}
|
|
|
|
func (pt *PartitionTable) Clone() Entity {
|
|
if pt == nil {
|
|
return nil
|
|
}
|
|
|
|
clone := &PartitionTable{
|
|
Size: pt.Size,
|
|
UUID: pt.UUID,
|
|
Type: pt.Type,
|
|
Partitions: make([]Partition, len(pt.Partitions)),
|
|
SectorSize: pt.SectorSize,
|
|
ExtraPadding: pt.ExtraPadding,
|
|
}
|
|
|
|
for idx, partition := range pt.Partitions {
|
|
ent := partition.Clone()
|
|
var part *Partition
|
|
|
|
if ent != nil {
|
|
pEnt, cloneOk := ent.(*Partition)
|
|
if !cloneOk {
|
|
panic("PartitionTable.Clone() returned an Entity that cannot be converted to *PartitionTable; this is a programming error")
|
|
}
|
|
part = pEnt
|
|
}
|
|
clone.Partitions[idx] = *part
|
|
}
|
|
return clone
|
|
}
|
|
|
|
// AlignUp will align the given bytes to next aligned grain if not already
|
|
// aligned
|
|
func (pt *PartitionTable) AlignUp(size uint64) uint64 {
|
|
grain := DefaultGrainBytes
|
|
if size%grain == 0 {
|
|
// already aligned: return unchanged
|
|
return size
|
|
}
|
|
return ((size + grain) / grain) * grain
|
|
}
|
|
|
|
// Convert the given bytes to the number of sectors.
|
|
func (pt *PartitionTable) BytesToSectors(size uint64) uint64 {
|
|
sectorSize := pt.SectorSize
|
|
if sectorSize == 0 {
|
|
sectorSize = DefaultSectorSize
|
|
}
|
|
return size / sectorSize
|
|
}
|
|
|
|
// Convert the given number of sectors to bytes.
|
|
func (pt *PartitionTable) SectorsToBytes(size uint64) uint64 {
|
|
sectorSize := pt.SectorSize
|
|
if sectorSize == 0 {
|
|
sectorSize = DefaultSectorSize
|
|
}
|
|
return size * sectorSize
|
|
}
|
|
|
|
// Returns if the partition table contains a filesystem with the given
|
|
// mount point.
|
|
func (pt *PartitionTable) ContainsMountpoint(mountpoint string) bool {
|
|
return len(entityPath(pt, mountpoint)) > 0
|
|
}
|
|
|
|
// Create a new filesystem within the partition table at the given mountpoint
|
|
// with the given minimum size in bytes.
|
|
func (pt *PartitionTable) CreateFilesystem(mountpoint string, size uint64) error {
|
|
filesystem := Filesystem{
|
|
Type: "xfs",
|
|
Mountpoint: mountpoint,
|
|
FSTabOptions: "defaults",
|
|
FSTabFreq: 0,
|
|
FSTabPassNo: 0,
|
|
}
|
|
|
|
partition := Partition{
|
|
Size: size,
|
|
Payload: &filesystem,
|
|
}
|
|
|
|
n := len(pt.Partitions)
|
|
var maxNo int
|
|
|
|
if pt.Type == "gpt" {
|
|
partition.Type = FilesystemDataGUID
|
|
maxNo = 128
|
|
} else {
|
|
maxNo = 4
|
|
}
|
|
|
|
if n == maxNo {
|
|
return fmt.Errorf("maximum number of partitions reached (%d)", maxNo)
|
|
}
|
|
|
|
pt.Partitions = append(pt.Partitions, partition)
|
|
|
|
return nil
|
|
}
|
|
|
|
// Generate all needed UUIDs for all the partiton and filesystems
|
|
//
|
|
// Will not overwrite existing UUIDs and only generate UUIDs for
|
|
// partitions if the layout is GPT.
|
|
func (pt *PartitionTable) GenerateUUIDs(rng *rand.Rand) {
|
|
setuuid := func(ent Entity, path []Entity) error {
|
|
if ui, ok := ent.(UniqueEntity); ok {
|
|
ui.GenUUID(rng)
|
|
}
|
|
return nil
|
|
}
|
|
_ = pt.ForEachEntity(setuuid)
|
|
|
|
// if this is a MBR partition table, there is no need to generate
|
|
// uuids for the partitions themselves
|
|
if pt.Type != "gpt" {
|
|
return
|
|
}
|
|
|
|
for idx, part := range pt.Partitions {
|
|
if part.UUID == "" {
|
|
pt.Partitions[idx].UUID = uuid.Must(newRandomUUIDFromReader(rng)).String()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (pt *PartitionTable) GetItemCount() uint {
|
|
return uint(len(pt.Partitions))
|
|
}
|
|
|
|
func (pt *PartitionTable) GetChild(n uint) Entity {
|
|
return &pt.Partitions[n]
|
|
}
|
|
|
|
func (pt *PartitionTable) GetSize() uint64 {
|
|
return pt.Size
|
|
}
|
|
|
|
func (pt *PartitionTable) EnsureSize(s uint64) bool {
|
|
if s > pt.Size {
|
|
pt.Size = s
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (pt *PartitionTable) CreateVolume(mountpoint string, size uint64) (Entity, error) {
|
|
filesystem := Filesystem{
|
|
Type: "xfs",
|
|
Mountpoint: mountpoint,
|
|
FSTabOptions: "defaults",
|
|
FSTabFreq: 0,
|
|
FSTabPassNo: 0,
|
|
}
|
|
|
|
partition := Partition{
|
|
Size: size,
|
|
Payload: &filesystem,
|
|
}
|
|
|
|
n := len(pt.Partitions)
|
|
var maxNo int
|
|
|
|
if pt.Type == "gpt" {
|
|
partition.Type = FilesystemDataGUID
|
|
maxNo = 128
|
|
} else {
|
|
maxNo = 4
|
|
}
|
|
|
|
if n == maxNo {
|
|
return nil, fmt.Errorf("maximum number of partitions reached (%d)", maxNo)
|
|
}
|
|
|
|
pt.Partitions = append(pt.Partitions, partition)
|
|
|
|
return &pt.Partitions[len(pt.Partitions)-1], nil
|
|
}
|
|
|
|
type EntityCallback func(e Entity, path []Entity) error
|
|
|
|
func forEachEntity(e Entity, path []Entity, cb EntityCallback) error {
|
|
|
|
childPath := append(path, e)
|
|
err := cb(e, childPath)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
c, ok := e.(Container)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
for idx := uint(0); idx < c.GetItemCount(); idx++ {
|
|
child := c.GetChild(idx)
|
|
err = forEachEntity(child, childPath, cb)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ForEachEntity runs the provided callback function on each entity in
|
|
// the PartitionTable.
|
|
func (pt *PartitionTable) ForEachEntity(cb EntityCallback) error {
|
|
return forEachEntity(pt, []Entity{}, cb)
|
|
}
|
|
|
|
// 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.
|
|
// Will grow the root partition if there is any empty space.
|
|
// Returns the updated start point.
|
|
func (pt *PartitionTable) relayout(size uint64) uint64 {
|
|
// always reserve one extra sector for the GPT header
|
|
header := pt.SectorsToBytes(1)
|
|
footer := uint64(0)
|
|
|
|
if pt.Type == "gpt" {
|
|
|
|
// calculate the space we need for
|
|
parts := len(pt.Partitions)
|
|
|
|
// reserve a minimum of 128 partition entires
|
|
if parts < 128 {
|
|
parts = 128
|
|
}
|
|
|
|
header += uint64(parts * 128)
|
|
|
|
footer = header
|
|
}
|
|
|
|
start := pt.AlignUp(header)
|
|
size = pt.AlignUp(size)
|
|
|
|
var rootIdx = -1
|
|
for idx := range pt.Partitions {
|
|
partition := &pt.Partitions[idx]
|
|
if len(entityPath(partition, "/")) != 0 {
|
|
rootIdx = idx
|
|
continue
|
|
}
|
|
partition.Start = start
|
|
partition.Size = pt.AlignUp(partition.Size)
|
|
start += partition.Size
|
|
}
|
|
|
|
if rootIdx < 0 {
|
|
panic("no root filesystem found; this is a programming error")
|
|
}
|
|
|
|
root := &pt.Partitions[rootIdx]
|
|
root.Start = start
|
|
|
|
// add the extra padding specified in the partition table
|
|
footer += pt.ExtraPadding
|
|
|
|
// If the sum of all partitions is bigger then the specified size,
|
|
// we use that instead. Grow the partition table size if needed.
|
|
end := pt.AlignUp(root.Start + footer + root.Size)
|
|
if end > size {
|
|
size = end
|
|
}
|
|
|
|
if size > pt.Size {
|
|
pt.Size = size
|
|
}
|
|
|
|
// If there is space left in the partition table, grow root
|
|
root.Size = pt.Size - root.Start
|
|
|
|
// Finally we shrink the last partition, i.e. the root partition,
|
|
// to leave space for the footer, e.g. the secondary GPT header.
|
|
root.Size -= footer
|
|
|
|
return start
|
|
}
|
|
|
|
func (pt *PartitionTable) createFilesystem(mountpoint string, size uint64) error {
|
|
rootPath := entityPath(pt, "/")
|
|
if rootPath == nil {
|
|
panic("no root mountpoint for PartitionTable")
|
|
}
|
|
|
|
var vc VolumeContainer
|
|
var entity Entity
|
|
var idx int
|
|
for idx, entity = range rootPath {
|
|
var ok bool
|
|
if vc, ok = entity.(VolumeContainer); ok {
|
|
break
|
|
}
|
|
}
|
|
|
|
if vc == nil {
|
|
panic("could not find root volume container")
|
|
}
|
|
|
|
newVol, err := vc.CreateVolume(mountpoint, 0)
|
|
if err != nil {
|
|
return fmt.Errorf("failed creating volume: " + err.Error())
|
|
}
|
|
vcPath := append([]Entity{newVol}, rootPath[idx:]...)
|
|
resizeEntityBranch(vcPath, size)
|
|
return nil
|
|
}
|
|
|
|
// entityPath stats at ent and searches for an Entity with a Mountpoint equal
|
|
// to the target. Returns a slice of all the Entities leading to the Mountable
|
|
// in reverse order. If no Entity has the target as a Mountpoint, returns nil.
|
|
// If a slice is returned, the last element is always the starting Entity ent
|
|
// and the first element is always a Mountable with a Mountpoint equal to the
|
|
// target.
|
|
func entityPath(ent Entity, target string) []Entity {
|
|
switch e := ent.(type) {
|
|
case Mountable:
|
|
if target == e.GetMountpoint() {
|
|
return []Entity{ent}
|
|
}
|
|
case Container:
|
|
for idx := uint(0); idx < e.GetItemCount(); idx++ {
|
|
child := e.GetChild(idx)
|
|
path := entityPath(child, target)
|
|
if path != nil {
|
|
path = append(path, e)
|
|
return path
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type MountableCallback func(mnt Mountable, path []Entity) error
|
|
|
|
func forEachMountable(c Container, path []Entity, cb MountableCallback) error {
|
|
for idx := uint(0); idx < c.GetItemCount(); idx++ {
|
|
child := c.GetChild(idx)
|
|
childPath := append(path, child)
|
|
var err error
|
|
switch ent := child.(type) {
|
|
case Mountable:
|
|
err = cb(ent, childPath)
|
|
case Container:
|
|
err = forEachMountable(ent, childPath, cb)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ForEachMountable runs the provided callback function on each Mountable in
|
|
// the PartitionTable.
|
|
func (pt *PartitionTable) ForEachMountable(cb MountableCallback) error {
|
|
return forEachMountable(pt, []Entity{pt}, cb)
|
|
}
|
|
|
|
// FindMountable returns the Mountable entity with the given mountpoint in the
|
|
// PartitionTable. Returns nil if no Entity has the target as a Mountpoint.
|
|
func (pt *PartitionTable) FindMountable(mountpoint string) Mountable {
|
|
path := entityPath(pt, mountpoint)
|
|
|
|
if len(path) == 0 {
|
|
return nil
|
|
}
|
|
// first path element is guaranteed to be Mountable
|
|
return path[0].(Mountable)
|
|
}
|
|
|
|
func clampFSSize(mountpoint string, size uint64) uint64 {
|
|
// set a minimum size of 1GB for all mountpoints
|
|
var minSize uint64 = 1073741824
|
|
if mountpoint == "/usr" {
|
|
// set a minimum size of 2GB for `/usr` mountpoint
|
|
// since this is current behaviour and the minimum
|
|
// required to create a bootable image
|
|
minSize = 2147483648
|
|
}
|
|
if minSize > size {
|
|
return minSize
|
|
}
|
|
return size
|
|
}
|
|
|
|
func resizeEntityBranch(path []Entity, size uint64) {
|
|
if len(path) == 0 {
|
|
return
|
|
}
|
|
|
|
element := path[0]
|
|
|
|
if c, ok := element.(Container); ok {
|
|
containerSize := uint64(0)
|
|
for idx := uint(0); idx < c.GetItemCount(); idx++ {
|
|
if s, ok := c.GetChild(idx).(Sizeable); ok {
|
|
containerSize += s.GetSize()
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
if containerSize > size {
|
|
size = containerSize
|
|
}
|
|
}
|
|
if sz, ok := element.(Sizeable); ok {
|
|
if !sz.EnsureSize(size) {
|
|
return
|
|
}
|
|
}
|
|
resizeEntityBranch(path[1:], size)
|
|
}
|
|
|
|
// GenUUID generates and sets UUIDs for all Partitions in the PartitionTable if
|
|
// the layout is GPT.
|
|
func (pt *PartitionTable) GenUUID(rng *rand.Rand) {
|
|
if pt.UUID == "" {
|
|
pt.UUID = uuid.Must(newRandomUUIDFromReader(rng)).String()
|
|
}
|
|
}
|