Support raw payloads in yaml partition info

internal/testdisk/partition.go

@@ -400,8 +400,7 @@ func MakeFakePartitionTable(mntPoints ...string) *disk.PartitionTable {
 			payload = swap
 		case "raw":
 			payload = &disk.Raw{
-				SourcePipeline: "build",
-				SourcePath:     "/usr/lib/modules/5.0/aboot.img",
+				SourcePath: "/usr/lib/modules/5.0/aboot.img",
 			}
 		default:
 			payload = &disk.Filesystem{

pkg/disk/partition_table.go

@@ -853,6 +853,7 @@ type partitionTableFeatures struct {
 	EXT4  bool
 	LUKS  bool
 	Swap  bool
+	Raw   bool
 }
 
 // features examines all of the PartitionTable entities and returns a struct
@@ -881,6 +882,8 @@ func (pt *PartitionTable) features() partitionTableFeatures {
 			case "ext4":
 				ptFeatures.EXT4 = true
 			}
+		case *Raw:
+			ptFeatures.Raw = true
 		case *Swap:
 			ptFeatures.Swap = true
 		case *LUKSContainer:

pkg/disk/raw.go

@@ -7,8 +7,7 @@ import (
 // Raw defines the payload for a raw partition. It's similar to a
 // [Filesystem] but with fewer fields. It is a [PayloadEntity].
 type Raw struct {
-	SourcePipeline string
-	SourcePath     string
+	SourcePath string `json:"source_path" yaml:"source_path"`
 }
 
 func init() {
@@ -25,7 +24,6 @@ func (s *Raw) Clone() Entity {
 	}
 
 	return &Raw{
-		SourcePipeline: s.SourcePipeline,
-		SourcePath:     s.SourcePath,
+		SourcePath: s.SourcePath,
 	}
 }

pkg/image/bootc_disk.go

@@ -46,6 +46,7 @@ func (img *BootcDiskImage) InstantiateManifestFromContainers(m *manifest.Manifes
 	var copyFilesFrom map[string][]string
 	var ensureDirs []*fsnode.Directory
 
+	var customSourcePipeline = ""
 	if *img.ContainerSource != *img.BuildContainerSource {
 		// If we're using a different build container from the target container then we copy
 		// the bootc customization file directories from the target container. This includes the
@@ -79,6 +80,8 @@ func (img *BootcDiskImage) InstantiateManifestFromContainers(m *manifest.Manifes
 				EnsureDirs:         ensureDirs,
 			})
 		targetBuildPipeline.Checkpoint()
+
+		customSourcePipeline = targetBuildPipeline.Name()
 	}
 
 	buildContainers := []container.SourceSpec{*img.BuildContainerSource}
@@ -97,6 +100,9 @@ func (img *BootcDiskImage) InstantiateManifestFromContainers(m *manifest.Manifes
 	var hostPipeline manifest.Build
 
 	rawImage := manifest.NewRawBootcImage(buildPipeline, containers, img.platform)
+	if customSourcePipeline != "" {
+		rawImage.SourcePipeline = customSourcePipeline
+	}
 	rawImage.PartitionTable = img.PartitionTable
 	rawImage.Users = img.OSCustomizations.Users
 	rawImage.Groups = img.OSCustomizations.Groups

pkg/manifest/anaconda_installer_iso_tree.go

@@ -484,7 +484,7 @@ func (p *AnacondaInstallerISOTree) serialize() osbuild.Pipeline {
 		Size:     fmt.Sprintf("%d", p.PartitionTable.Size),
 	}))
 
-	for _, stage := range osbuild.GenFsStages(p.PartitionTable, filename) {
+	for _, stage := range osbuild.GenFsStages(p.PartitionTable, filename, p.anacondaPipeline.Name()) {
 		pipeline.AddStage(stage)
 	}
 

pkg/manifest/coi_iso_tree.go

@@ -111,7 +111,7 @@ func (p *CoreOSISOTree) serialize() osbuild.Pipeline {
 		Size:     fmt.Sprintf("%d", p.PartitionTable.Size),
 	}))
 
-	for _, stage := range osbuild.GenFsStages(p.PartitionTable, filename) {
+	for _, stage := range osbuild.GenFsStages(p.PartitionTable, filename, p.payloadPipeline.Name()) {
 		pipeline.AddStage(stage)
 	}
 

pkg/manifest/raw.go

@@ -52,7 +52,7 @@ func (p *RawImage) serialize() osbuild.Pipeline {
 		panic("no partition table in live image")
 	}
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, p.Filename(), p.PartTool) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, p.Filename(), p.PartTool, p.treePipeline.Name()) {
 		pipeline.AddStage(stage)
 	}
 

pkg/manifest/raw_bootc.go

@@ -48,6 +48,9 @@ type RawBootcImage struct {
 	// MountUnits creates systemd .mount units to describe the filesystem
 	// instead of writing to /etc/fstab
 	MountUnits bool
+
+	// Source pipeline for files written to raw partitions
+	SourcePipeline string
 }
 
 func (p RawBootcImage) Filename() string {
@@ -64,7 +67,8 @@ func NewRawBootcImage(buildPipeline Build, containers []container.SourceSpec, pl
 		filename: "disk.img",
 		platform: platform,
 
-		containers: containers,
+		containers:     containers,
+		SourcePipeline: buildPipeline.Name(),
 	}
 	buildPipeline.addDependent(p)
 	return p
@@ -133,7 +137,7 @@ func (p *RawBootcImage) serialize() osbuild.Pipeline {
 		panic(fmt.Errorf("no partition table in live image"))
 	}
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, p.filename, osbuild.PTSfdisk) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, p.filename, osbuild.PTSfdisk, p.SourcePipeline) {
 		pipeline.AddStage(stage)
 	}
 

pkg/manifest/raw_ostree.go

@@ -58,7 +58,7 @@ func (p *RawOSTreeImage) serialize() osbuild.Pipeline {
 		panic("no partition table in live image")
 	}
 
-	for _, stage := range osbuild.GenImagePrepareStages(pt, p.Filename(), osbuild.PTSfdisk) {
+	for _, stage := range osbuild.GenImagePrepareStages(pt, p.Filename(), osbuild.PTSfdisk, p.treePipeline.Name()) {
 		pipeline.AddStage(stage)
 	}
 

pkg/osbuild/disk.go

@@ -67,7 +67,7 @@ const (
 	PTSgdisk PartTool = "sgdisk"
 )
 
-func GenImagePrepareStages(pt *disk.PartitionTable, filename string, partTool PartTool) []*Stage {
+func GenImagePrepareStages(pt *disk.PartitionTable, filename string, partTool PartTool, sourcePipeline string) []*Stage {
 	stages := make([]*Stage, 0)
 
 	// create an empty file of the given size via `org.osbuild.truncate`
@@ -106,7 +106,7 @@ func GenImagePrepareStages(pt *disk.PartitionTable, filename string, partTool Pa
 
 	// Generate all the filesystems, subvolumes, and swap areas on partitons
 	// and devices
-	s = GenFsStages(pt, filename)
+	s = GenFsStages(pt, filename, sourcePipeline)
 	stages = append(stages, s...)
 
 	return stages

pkg/osbuild/disk_test.go

@@ -74,7 +74,7 @@ func TestGenImageKernelOptionsBtrfsNotRootCmdlineGenerated(t *testing.T) {
 func TestGenImagePrepareStages(t *testing.T) {
 	pt := testdisk.MakeFakeBtrfsPartitionTable("/", "/boot")
 	filename := "image.raw"
-	actualStages := GenImagePrepareStages(pt, filename, PTSfdisk)
+	actualStages := GenImagePrepareStages(pt, filename, PTSfdisk, "build")
 
 	assert.Equal(t, []*Stage{
 		{

pkg/osbuild/mkfs_stage.go

@@ -30,7 +30,7 @@ func getDevicesForFsStage(path []disk.Entity, filename string) map[string]Device
 //   - org.osbuild.mkfs.*: for all filesystems and btrfs volumes
 //   - org.osbuild.btrfs.subvol: for all btrfs subvolumes
 //   - org.osbuild.mkswap: for swap areas
-func GenFsStages(pt *disk.PartitionTable, filename string) []*Stage {
+func GenFsStages(pt *disk.PartitionTable, filename string, soucePipeline string) []*Stage {
 	stages := make([]*Stage, 0, len(pt.Partitions))
 
 	genStage := func(ent disk.Entity, path []disk.Entity) error {
@@ -99,7 +99,7 @@ func GenFsStages(pt *disk.PartitionTable, filename string) []*Stage {
 			options := &WriteDeviceStageOptions{
 				From: fmt.Sprintf("input://%s", filepath.Join(inputName, e.SourcePath)),
 			}
-			inputs := NewPipelineTreeInputs(inputName, e.SourcePipeline)
+			inputs := NewPipelineTreeInputs(inputName, soucePipeline)
 			stages = append(stages, NewWriteDeviceStage(options, inputs, stageDevices))
 		}
 		return nil

pkg/osbuild/mkfs_stages_test.go

@@ -79,7 +79,7 @@ func TestNewMkfsStage(t *testing.T) {
 
 func TestGenFsStages(t *testing.T) {
 	pt := testdisk.MakeFakePartitionTable("/", "/boot", "/boot/efi", "swap")
-	stages := GenFsStages(pt, "file.img")
+	stages := GenFsStages(pt, "file.img", "build")
 	assert.Equal(t, []*Stage{
 		{
 			Type: "org.osbuild.mkfs.ext4",
@@ -152,7 +152,7 @@ func TestGenFsStages(t *testing.T) {
 func TestGenFsStagesBtrfs(t *testing.T) {
 	// Let's put there /extra to make sure that / and /extra creates only one btrfs partition
 	pt := testdisk.MakeFakeBtrfsPartitionTable("/", "/boot", "/boot/efi", "/extra", "swap")
-	stages := GenFsStages(pt, "file.img")
+	stages := GenFsStages(pt, "file.img", "build")
 	assert.Equal(t, []*Stage{
 		{
 			Type:    "org.osbuild.mkfs.ext4",
@@ -258,7 +258,7 @@ func TestGenFsStagesBtrfs(t *testing.T) {
 
 func TestGenFsStagesLVM(t *testing.T) {
 	pt := testdisk.MakeFakeLVMPartitionTable("/", "/boot", "/boot/efi", "/home", "swap")
-	stages := GenFsStages(pt, "file.img")
+	stages := GenFsStages(pt, "file.img", "build")
 	assert.Equal(t, []*Stage{
 		{
 			Type:    "org.osbuild.mkfs.ext4",
@@ -365,7 +365,7 @@ func TestGenFsStagesLVM(t *testing.T) {
 
 func TestGenFsStagesRaw(t *testing.T) {
 	pt := testdisk.MakeFakePartitionTable("/", "/boot", "/boot/efi", "raw")
-	stages := GenFsStages(pt, "file.img")
+	stages := GenFsStages(pt, "file.img", "build")
 	assert.Equal(t, []*Stage{
 		{
 			Type: "org.osbuild.mkfs.ext4",
@@ -448,6 +448,6 @@ func TestGenFsStagesUnhappy(t *testing.T) {
 	}
 
 	assert.PanicsWithValue(t, "unknown fs type: ext2", func() {
-		GenFsStages(pt, "file.img")
+		GenFsStages(pt, "file.img", "build")
 	})
 }