add iscsi support to the oci image type

internal/distro/fedora/distro.go

@@ -834,6 +834,7 @@ func newDistro(version int) distro.Distro {
 
 	ociImgType := qcow2ImgType
 	ociImgType.name = "oci"
+	ociImgType.environment = &environment.OCI{}
 
 	x86_64.addImageTypes(
 		&platform.X86{

internal/distro/rhel8/distro.go

@@ -214,9 +214,6 @@ func newDistro(name string, minor int) *distribution {
 		bootType: distro.LegacyBootType,
 	}
 
-	ociImgType := qcow2ImgType(rd)
-	ociImgType.name = "oci"
-
 	x86_64.addImageTypes(
 		&platform.X86{
 			BIOS:       true,
@@ -227,7 +224,7 @@ func newDistro(name string, minor int) *distribution {
 			},
 		},
 		qcow2ImgType(rd),
-		ociImgType,
+		ociImgType(rd),
 	)
 
 	x86_64.addImageTypes(
@@ -322,6 +319,7 @@ func newDistro(name string, minor int) *distribution {
 			},
 		},
 		qcow2ImgType(rd),
+		ociImgType(rd),
 	)
 
 	aarch64.addImageTypes(

internal/distro/rhel8/distro_test.go

@@ -525,6 +525,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 				"edge-raw-image",
 				"tar",
 				"image-installer",
+				"oci",
 			},
 		},
 		{

internal/distro/rhel8/qcow2.go

@@ -3,6 +3,7 @@ package rhel8
 import (
 	"github.com/osbuild/osbuild-composer/internal/common"
 	"github.com/osbuild/osbuild-composer/internal/distro"
+	"github.com/osbuild/osbuild-composer/internal/environment"
 	"github.com/osbuild/osbuild-composer/internal/osbuild"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 )
@@ -46,6 +47,13 @@ func qcow2ImgType(rd distribution) imageType {
 	return it
 }
 
+func ociImgType(d distribution) imageType {
+	it := qcow2ImgType(d)
+	it.name = "oci"
+	it.environment = &environment.OCI{}
+	return it
+}
+
 func openstackImgType() imageType {
 	return imageType{
 		name:     "openstack",

internal/distro/rhel9/distro.go

@@ -207,8 +207,7 @@ func newDistro(name string, minor int) *distribution {
 	}
 
 	qcow2ImgType := mkQcow2ImgType(rd)
-	ociImgType := qcow2ImgType
-	ociImgType.name = "oci"
+	ociImgType := mkOciImgType(rd)
 
 	x86_64.addImageTypes(
 		&platform.X86{
@@ -371,6 +370,7 @@ func newDistro(name string, minor int) *distribution {
 			},
 		},
 		qcow2ImgType,
+		ociImgType,
 	)
 	aarch64.addImageTypes(
 		&platform.Aarch64{

internal/distro/rhel9/distro_test.go

@@ -507,6 +507,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 				"image-installer",
 				"vhd",
 				"azure-rhui",
+				"oci",
 			},
 		},
 		{

internal/distro/rhel9/qcow2.go

@@ -3,6 +3,7 @@ package rhel9
 import (
 	"github.com/osbuild/osbuild-composer/internal/common"
 	"github.com/osbuild/osbuild-composer/internal/distro"
+	"github.com/osbuild/osbuild-composer/internal/environment"
 	"github.com/osbuild/osbuild-composer/internal/osbuild"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 )
@@ -169,3 +170,10 @@ func mkQcow2ImgType(d distribution) imageType {
 	it.defaultImageConfig = qcowImageConfig(d)
 	return it
 }
+
+func mkOciImgType(d distribution) imageType {
+	it := mkQcow2ImgType(d)
+	it.name = "oci"
+	it.environment = &environment.OCI{}
+	return it
+}

internal/environment/environment.go

@@ -6,6 +6,7 @@ type Environment interface {
 	GetPackages() []string
 	GetRepos() []rpmmd.RepoConfig
 	GetServices() []string
+	GetKernelOptions() []string
 }
 
 type BaseEnvironment struct {
@@ -23,3 +24,7 @@ func (p BaseEnvironment) GetRepos() []rpmmd.RepoConfig {
 func (p BaseEnvironment) GetServices() []string {
 	return []string{}
 }
+
+func (p BaseEnvironment) GetKernelOptions() []string {
+	return []string{}
+}

internal/environment/oci.go

@@ -0,0 +1,16 @@
+package environment
+
+type OCI struct {
+	BaseEnvironment
+}
+
+func (p *OCI) GetPackages() []string {
+	return []string{"iscsi-initiator-utils"}
+}
+
+func (p *OCI) GetKernelOptions() []string {
+	return []string{
+		"rd.iscsi.ibft=1",
+		"rd.iscsi.firmware=1",
+	}
+}

internal/manifest/os.go

@@ -512,6 +512,9 @@ func (p *OS) serialize() osbuild.Pipeline {
 	if pt := p.PartitionTable; pt != nil {
 		kernelOptions := osbuild.GenImageKernelOptions(p.PartitionTable)
 		kernelOptions = append(kernelOptions, p.KernelOptionsAppend...)
+		if p.Environment != nil {
+			kernelOptions = append(kernelOptions, p.Environment.GetKernelOptions()...)
+		}
 		if !p.KernelOptionsBootloader {
 			pipeline = prependKernelCmdlineStage(pipeline, strings.Join(kernelOptions, " "), pt)
 		}