distro: add distro.ImageOptions.Bootc.InstallerPayloadRef

Moving the installer payload ref for bootc into the
image options is a much nicer place than the previous
way of having it as part `BootcDistro`.

The alternative would be to make it part of
`BootcAnacondaInstaller`. This would imply an explicit
cast in all frontends so it seems this is preferable
(and similar to how ostree commits are configured).

Author: mvo5

cmd/gen-manifests/main.go

@@ -650,11 +650,6 @@ func main() {
 							panic(err)
 						}
 					}
-					if fakeBootcCnt.PayloadContainerRef != "" {
-						if err := distribution.SetInstallerPayload(fakeBootcCnt.PayloadContainerRef); err != nil {
-							panic(err)
-						}
-					}
 
 					imgType, err := archi.GetImageType(imgTypeName)
 					if err != nil {
@@ -673,6 +668,11 @@ func main() {
 							fmt.Printf("Skipping %s for %s/%s (reason: %v)\n", itConfig.Name, imgTypeName, distribution.Name(), reason)
 							continue
 						}
+						if fakeBootcCnt.PayloadContainerRef != "" {
+							itConfig.Options.Bootc = &distro.BootcImageOptions{
+								InstallerPayloadRef: fakeBootcCnt.PayloadContainerRef,
+							}
+						}
 
 						var repos []rpmmd.RepoConfig
 						job := makeManifestJob(itConfig, imgType, distribution, repos, archName, cacheRoot, outputDir, contentResolve, metadata, tmpdirRoot)

pkg/distro/bootc/bootc.go

@@ -31,10 +31,8 @@ import (
 var _ = distro.Distro(&BootcDistro{})
 
 type BootcDistro struct {
-	imgref      string
-	buildImgref string
-	// XXX: wrong place?
-	payloadRef      string
+	imgref          string
+	buildImgref     string
 	sourceInfo      *osinfo.Info
 	buildSourceInfo *osinfo.Info
 
@@ -85,12 +83,6 @@ func (d *BootcDistro) SetBuildContainer(imgref string) (err error) {
 	return d.setBuildContainer(imgref, info)
 }
 
-// XXX: wrong layer
-func (d *BootcDistro) SetInstallerPayload(imgref string) error {
-	d.payloadRef = imgref
-	return nil
-}
-
 func (d *BootcDistro) setBuildContainer(imgref string, info *osinfo.Info) error {
 	d.buildImgref = imgref
 	d.buildSourceInfo = info

pkg/distro/bootc/iso.go

@@ -110,6 +110,11 @@ func (t *BootcAnacondaInstaller) Manifest(bp *blueprint.Blueprint, options distr
 	if t.arch.distro.imgref == "" {
 		return nil, nil, fmt.Errorf("internal error: no base image defined")
 	}
+	if options.Bootc == nil || options.Bootc.InstallerPayloadRef == "" {
+		return nil, nil, fmt.Errorf("no installer payload bootc ref set")
+	}
+	payloadRef := options.Bootc.InstallerPayloadRef
+
 	containerSource := container.SourceSpec{
 		Source: t.arch.distro.imgref,
 		Name:   t.arch.distro.imgref,
@@ -153,8 +158,8 @@ func (t *BootcAnacondaInstaller) Manifest(bp *blueprint.Blueprint, options distr
 	img.InitramfsPath = fmt.Sprintf("lib/modules/%s/initramfs.img", t.arch.distro.sourceInfo.KernelInfo.Version)
 	img.InstallerHome = "/var/roothome"
 	payloadSource := container.SourceSpec{
-		Source: t.arch.distro.payloadRef,
-		Name:   t.arch.distro.payloadRef,
+		Source: payloadRef,
+		Name:   payloadRef,
 		Local:  true,
 	}
 	img.InstallerPayload = payloadSource

pkg/distro/distro.go

@@ -135,10 +135,15 @@ type ImageType interface {
 	Manifest(bp *blueprint.Blueprint, options ImageOptions, repos []rpmmd.RepoConfig, seed *int64) (*manifest.Manifest, []string, error)
 }
 
+type BootcImageOptions struct {
+	InstallerPayloadRef string `json:"installer_payload_ref,omitempty"`
+}
+
 // The ImageOptions specify options for a specific image build
 type ImageOptions struct {
 	Size             uint64                     `json:"size"`
 	OSTree           *ostree.ImageOptions       `json:"ostree,omitempty"`
+	Bootc            *BootcImageOptions         `json:"bootc,omitempty"`
 	Subscription     *subscription.ImageOptions `json:"subscription,omitempty"`
 	Facts            *facts.ImageOptions        `json:"facts,omitempty"`
 	PartitioningMode partition.PartitioningMode `json:"partitioning-mode,omitempty"`