osbuild2: optionally use sgdisk for partitioning

Add a new option to `GenImagePrepareStages`, which is used by all
modern pipelines for partitioning, to optionally use the `sgdisk`
partitioning tool via `org.osbuild.sgdisk`.

internal/distro/fedora/pipelines.go

@@ -619,7 +619,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/distro/rhel84/distro_backports.go

@@ -61,7 +61,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/distro/rhel85/pipelines.go

@@ -1664,7 +1664,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/distro/rhel86/pipelines.go

@@ -1065,7 +1065,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/distro/rhel90/pipelines.go

@@ -1060,7 +1060,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/distro/rhel90beta/pipelines.go

@@ -1051,7 +1051,7 @@ func liveImagePipeline(inputPipelineName string, outputFilename string, pt *disk
 	p.Name = "image"
 	p.Build = "name:build"
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, outputFilename, osbuild.PTSfdisk) {
 		p.AddStage(stage)
 	}
 

internal/osbuild2/disk.go

@@ -3,6 +3,7 @@ package osbuild2
 import (
 	"fmt"
 
+	"github.com/google/uuid"
 	"github.com/osbuild/osbuild-composer/internal/disk"
 )
 
@@ -28,7 +29,40 @@ func sfdiskStageOptions(pt *disk.PartitionTable) *SfdiskStageOptions {
 	return stageOptions
 }
 
-func GenImagePrepareStages(pt *disk.PartitionTable, filename string) []*Stage {
+// sgdiskStageOptions creates the options and devices properties for an
+// org.osbuild.sgdisk stage based on a partition table description
+func sgdiskStageOptions(pt *disk.PartitionTable) *SgdiskStageOptions {
+	partitions := make([]SgdiskPartition, len(pt.Partitions))
+	for idx, p := range pt.Partitions {
+		partitions[idx] = SgdiskPartition{
+			Bootable: p.Bootable,
+			Start:    pt.BytesToSectors(p.Start),
+			Size:     pt.BytesToSectors(p.Size),
+			Type:     p.Type,
+		}
+
+		if p.UUID != "" {
+			u := uuid.MustParse(p.UUID)
+			partitions[idx].UUID = &u
+		}
+	}
+
+	stageOptions := &SgdiskStageOptions{
+		UUID:       uuid.MustParse(pt.UUID),
+		Partitions: partitions,
+	}
+
+	return stageOptions
+}
+
+type PartTool string
+
+const (
+	PTSfdisk PartTool = "sfdisk"
+	PTSgdisk PartTool = "sgdisk"
+)
+
+func GenImagePrepareStages(pt *disk.PartitionTable, filename string, partTool PartTool) []*Stage {
 	stages := make([]*Stage, 0)
 
 	// create an empty file of the given size via `org.osbuild.truncate`
@@ -41,7 +75,6 @@ func GenImagePrepareStages(pt *disk.PartitionTable, filename string) []*Stage {
 	stages = append(stages, stage)
 
 	// create the partition layout in the empty file
-	sfOptions := sfdiskStageOptions(pt)
 	loopback := NewLoopbackDevice(
 		&LoopbackDeviceOptions{
 			Filename: filename,
@@ -49,8 +82,17 @@ func GenImagePrepareStages(pt *disk.PartitionTable, filename string) []*Stage {
 		},
 	)
 
-	sfdisk := NewSfdiskStage(sfOptions, loopback)
-	stages = append(stages, sfdisk)
+	if partTool == PTSfdisk {
+		sfOptions := sfdiskStageOptions(pt)
+		sfdisk := NewSfdiskStage(sfOptions, loopback)
+		stages = append(stages, sfdisk)
+	} else if partTool == PTSgdisk {
+		sgOptions := sgdiskStageOptions(pt)
+		sgdisk := NewSgdiskStage(sgOptions, loopback)
+		stages = append(stages, sgdisk)
+	} else {
+		panic("programming error: unknown PartTool: " + partTool)
+	}
 
 	// Generate all the needed "devices", like LUKS2 and LVM2
 	s := GenDeviceCreationStages(pt, filename)