image: add OSTreeSimplifiedInstaller.InstallerCustomimzations

The OSTreeSimplifiedInstaller is not an anaconda installer
but it still uses some of the anaconda structs. So lets
move it to use the same installer customizations.

Note that we cannot use the InstallerCustomizations.KernelAppend
with it as it will lead to a diff in the rhel-9.x
edge-simplified-installer image:
```yaml
--- /tmp/tmp07t_j3mj/ref/rhel_9.7-x86_64-edge_simplified_installer-edge_ostree_pull_device.json	2025-08-26 15:10:18.721496181 +0200
+++ /tmp/tmp07t_j3mj/new/rhel_9.7-x86_64-edge_simplified_installer-edge_ostree_pull_device.json	2025-08-26 15:10:21.201572008 +0200
@@ -1100,7 +1100,10 @@
                 "coreos.inst.isoroot=RHEL-9-7-0-BaseOS-x86_64",
                 "coreos.inst.install_dev=/dev/sda",
                 "coreos.inst.image_file=/run/media/iso/image.raw.xz",
-                "coreos.inst.insecure"
+                "coreos.inst.insecure",
+                "modprobe.blacklist=vc4",
+                "rw",
+                "coreos.no_persist_ip"
               ]
             },
             "isolabel": "RHEL-9-7-0-BaseOS-x86_64",
@@ -1259,7 +1262,10 @@
                 "coreos.inst.isoroot=RHEL-9-7-0-BaseOS-x86_64",
                 "coreos.inst.install_dev=/dev/sda",
                 "coreos.inst.image_file=/run/media/iso/image.raw.xz",
-                "coreos.inst.insecure"
+                "coreos.inst.insecure",
+                "modprobe.blacklist=vc4",
+                "rw",
+                "coreos.no_persist_ip"
               ]
             }
           }
```
This is because the edge-simplified-installer for rhel uses
the kernel options from the base image type only for the
deployed system but does not add it to the ISO kernel commandline.

Its unclear if we should unify this or not but this commit errs
on the side of caution.

Author: mvo5

pkg/distro/generic/images.go

@@ -880,28 +880,11 @@ func iotSimplifiedInstallerImage(t *imageType,
 			}
 		}
 	}
-
-	installerConfig, err := t.getDefaultInstallerConfig()
+	img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations)
 	if err != nil {
 		return nil, err
 	}
-
-	if installerConfig != nil {
-		img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
-		img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
-	}
-
-	// XXX: move to use InstallerCustomizations too
-	d := t.arch.distro
-	img.Product = d.Product()
-	img.Variant = t.ImageTypeYAML.Variant
 	img.OSName = t.OSTree.Name
-	img.OSVersion = d.OsVersion()
-
-	img.ISOLabel, err = t.ISOLabel()
-	if err != nil {
-		return nil, err
-	}
 
 	return img, nil
 }

pkg/image/ostree_simplified_installer.go

@@ -21,25 +21,15 @@ type OSTreeSimplifiedInstaller struct {
 	// Raw image that will be created and embedded
 	rawImage *OSTreeDiskImage
 
-	OSCustomizations manifest.OSCustomizations
-	Environment      environment.Environment
+	OSCustomizations        manifest.OSCustomizations
+	Environment             environment.Environment
+	InstallerCustomizations manifest.InstallerCustomizations
 
 	ExtraBasePackages rpmmd.PackageSet
 
-	ISOLabel string
-
 	// ISO label template (architecture-free)
 	ISOLabelTmpl string
 
-	// Product string for ISO buildstamp
-	Product string
-
-	// OSVersion string for ISO buildstamp
-	OSVersion string
-
-	// Variant string for ISO buildstamp
-	Variant string
-
 	// OSName for ostree deployment
 	OSName string
 
@@ -52,9 +42,6 @@ type OSTreeSimplifiedInstaller struct {
 
 	// Ignition embedded configuration options
 	IgnitionEmbedded *ignition.EmbeddedOptions
-
-	AdditionalDracutModules []string
-	AdditionalDrivers       []string
 }
 
 func NewOSTreeSimplifiedInstaller(platform platform.Platform, filename string, rawImage *OSTreeDiskImage, installDevice string) *OSTreeSimplifiedInstaller {
@@ -83,29 +70,29 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest,
 		img.platform,
 		repos,
 		"kernel",
-		img.Product,
-		img.OSVersion,
+		img.InstallerCustomizations.Product,
+		img.InstallerCustomizations.OSVersion,
 	)
 	coiPipeline.ExtraPackages = img.ExtraBasePackages.Include
 	coiPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
 	coiPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
 	coiPipeline.FDO = img.FDO
 	coiPipeline.Ignition = img.IgnitionEmbedded
 	coiPipeline.Biosdevname = (img.platform.GetArch() == arch.ARCH_X86_64)
-	coiPipeline.Variant = img.Variant
-	coiPipeline.AdditionalDracutModules = img.AdditionalDracutModules
-	coiPipeline.AdditionalDrivers = img.AdditionalDrivers
+	coiPipeline.Variant = img.InstallerCustomizations.Variant
+	coiPipeline.AdditionalDracutModules = img.InstallerCustomizations.AdditionalDracutModules
+	coiPipeline.AdditionalDrivers = img.InstallerCustomizations.AdditionalDrivers
 
 	var isoLabel string
 
-	if len(img.ISOLabel) > 0 {
-		isoLabel = img.ISOLabel
+	if len(img.InstallerCustomizations.ISOLabel) > 0 {
+		isoLabel = img.InstallerCustomizations.ISOLabel
 	} else {
 		// TODO: replace isoLabelTmpl with more high-level properties
 		isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.platform.GetArch())
 	}
 
-	bootTreePipeline := manifest.NewEFIBootTree(buildPipeline, img.Product, img.OSVersion)
+	bootTreePipeline := manifest.NewEFIBootTree(buildPipeline, img.InstallerCustomizations.Product, img.InstallerCustomizations.OSVersion)
 	bootTreePipeline.Platform = img.platform
 	bootTreePipeline.UEFIVendor = img.platform.GetUEFIVendor()
 	bootTreePipeline.ISOLabel = isoLabel
@@ -136,7 +123,16 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest,
 			kernelOpts = append(kernelOpts, "fdo.di_mfg_string_type_mac_iface="+img.FDO.DiMfgStringTypeMacIface)
 		}
 	}
-
+	// Note that we do not use the
+	// InstlerCustomizations.KernelOptionsAppend here because
+	// InstallerCustomizations.KernelOptionsAppend also picks up
+	// the kernel options from the imageConfig but we only set
+	// those in the rawImage.OSTreeDeploymentCustomizations and
+	// not in the bootTreePipeline. Its unclear if we should change
+	// this or not. Its inconsistent with the other installers but
+	// then simplifiedInstaler is special.
+	//
+	// kernelOpts = append(kernelOpts, img.InstallerCustomizations.KernelOptionsAppend...)
 	bootTreePipeline.KernelOpts = kernelOpts
 
 	// enable ISOLinux on x86_64 only

pkg/image/ostree_simplified_installer_test.go

@@ -19,15 +19,15 @@ func TestSimplifiedInstallerDracut(t *testing.T) {
 	ostreeDiskImage := image.NewOSTreeDiskImageFromCommit(platform, "filename", commit)
 	ostreeDiskImage.PartitionTable = testdisk.MakeFakePartitionTable("/")
 	img := image.NewOSTreeSimplifiedInstaller(testPlatform, "filename", ostreeDiskImage, "")
-	img.Product = product
-	img.OSVersion = osversion
-	img.ISOLabel = isolabel
+	img.InstallerCustomizations.Product = product
+	img.InstallerCustomizations.OSVersion = osversion
+	img.InstallerCustomizations.ISOLabel = isolabel
 
 	testModules := []string{"test-module"}
 	testDrivers := []string{"test-driver"}
 
-	img.AdditionalDracutModules = testModules
-	img.AdditionalDrivers = testDrivers
+	img.InstallerCustomizations.AdditionalDracutModules = testModules
+	img.InstallerCustomizations.AdditionalDrivers = testDrivers
 
 	commitSpec := map[string][]ostree.CommitSpec{
 		"ostree-deployment": {