imagetypes: mark rpm based ISOs as legacy

We want to move into a world where we build the anaconda image from
bootc containers instead of our current RPM based construction [0]
so lets mark the rpm based installer ISO image types as legacy.

This should make it easy to support a potential new `bootc-iso`
or `bootc-installer` image type [0] while still supporting the
legacy mode for a while.

Author: mvo5

bib/cmd/bootc-image-builder/main.go

@@ -149,10 +149,10 @@ func manifestFromCobra(cmd *cobra.Command, args []string, pbar progress.Progress
 
 	// Note that we only need to pass a single imgType here into the manifest generation because:
 	// 1. the bootc disk manifests contains exports for all supported image types
-	// 2. the bootc iso is always a single build
+	// 2. the bootc legacy types (iso, anaconda-iso) always do a single build
 	imgType := imgTypes[0]
-	if imageTypes.BuildsISO() {
-		return manifestFromCobraForISO(imgref, buildImgref, imgType, rootFs, rpmCacheRoot, config, useLibrepo, cntArch)
+	if imageTypes.Legacy() {
+		return manifestFromCobraForLegacyISO(imgref, buildImgref, imgType, rootFs, rpmCacheRoot, config, useLibrepo, cntArch)
 	}
 	return manifestFromCobraForDisk(imgref, buildImgref, imgType, rootFs, rpmCacheRoot, config, useLibrepo, cntArch)
 }

bib/internal/imagetypes/imagetypes.go

@@ -10,17 +10,22 @@ import (
 type imageType struct {
 	Export string
 	ISO    bool
+	Legacy bool
 }
 
 var supportedImageTypes = map[string]imageType{
-	"ami":          imageType{Export: "image"},
-	"qcow2":        imageType{Export: "qcow2"},
-	"raw":          imageType{Export: "image"},
-	"vmdk":         imageType{Export: "vmdk"},
-	"vhd":          imageType{Export: "vpc"},
-	"gce":          imageType{Export: "gce"},
-	"anaconda-iso": imageType{Export: "bootiso", ISO: true},
-	"iso":          imageType{Export: "bootiso", ISO: true},
+	// XXX: ideally we would look how to consolidate all
+	// knownledge about disk based image types into the images
+	// library
+	"ami":   imageType{Export: "image"},
+	"qcow2": imageType{Export: "qcow2"},
+	"raw":   imageType{Export: "image"},
+	"vmdk":  imageType{Export: "vmdk"},
+	"vhd":   imageType{Export: "vpc"},
+	"gce":   imageType{Export: "gce"},
+	// the iso image types are RPM based and legacy/deprecated
+	"anaconda-iso": imageType{Export: "bootiso", ISO: true, Legacy: true},
+	"iso":          imageType{Export: "bootiso", ISO: true, Legacy: true},
 }
 
 // Available() returns a comma-separated list of supported image types
@@ -86,3 +91,12 @@ func (it ImageTypes) BuildsISO() bool {
 	// XXX: this assumes a valid ImagTypes object
 	return supportedImageTypes[it[0]].ISO
 }
+
+func (it ImageTypes) Legacy() bool {
+	for _, name := range it {
+		if supportedImageTypes[name].Legacy {
+			return true
+		}
+	}
+	return false
+}