diff --git a/pkg/distro/fedora/images.go b/pkg/distro/fedora/images.go index 55d7c2b147..15f3d764f6 100644 --- a/pkg/distro/fedora/images.go +++ b/pkg/distro/fedora/images.go @@ -421,6 +421,13 @@ func liveInstallerImage(workload workload.Workload, img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...) } + // In Fedora 42 the ifcfg module was replaced by net-lib. + if common.VersionLessThan(d.osVersion, "42") { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "ifcfg") + } else { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "net-lib") + } + return img, nil } @@ -486,6 +493,13 @@ func imageInstallerImage(workload workload.Workload, d := t.arch.distro + // In Fedora 42 the ifcfg module was replaced by net-lib. + if common.VersionLessThan(d.osVersion, "42") { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "ifcfg") + } else { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "net-lib") + } + img.Product = d.product // We don't know the variant that goes into the OS pipeline that gets installed @@ -701,6 +715,13 @@ func iotInstallerImage(workload workload.Workload, img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...) } + // In Fedora 42 the ifcfg module was replaced by net-lib. + if common.VersionLessThan(d.osVersion, "42") { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "ifcfg") + } else { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "net-lib") + } + img.Product = d.product img.Variant = "IoT" img.OSVersion = d.osVersion @@ -837,6 +858,13 @@ func iotSimplifiedInstallerImage(workload workload.Workload, img.AdditionalDracutModules = append(img.AdditionalDracutModules, "dbus-broker") d := t.arch.distro + // In Fedora 42 the ifcfg module was replaced by net-lib. + if common.VersionLessThan(d.osVersion, "42") { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "ifcfg") + } else { + img.AdditionalDracutModules = append(img.AdditionalDracutModules, "net-lib") + } + img.Product = d.product img.Variant = "IoT" img.OSName = "fedora" diff --git a/pkg/distro/rhel/rhel10/bare_metal.go b/pkg/distro/rhel/rhel10/bare_metal.go index 711992f5ff..7fe1c53b77 100644 --- a/pkg/distro/rhel/rhel10/bare_metal.go +++ b/pkg/distro/rhel/rhel10/bare_metal.go @@ -53,6 +53,7 @@ func mkImageInstallerImgType() *rhel.ImageType { "nvdimm", // non-volatile DIMM firmware (provides nfit, cuse, and nd_e820) "prefixdevname", "prefixdevname-tools", + "net-lib", }, AdditionalDrivers: []string{ "ipmi_devintf", diff --git a/pkg/distro/rhel/rhel8/bare_metal.go b/pkg/distro/rhel/rhel8/bare_metal.go index 0d5fbe066c..e1703e871b 100644 --- a/pkg/distro/rhel/rhel8/bare_metal.go +++ b/pkg/distro/rhel/rhel8/bare_metal.go @@ -32,6 +32,7 @@ func mkImageInstaller() *rhel.ImageType { AdditionalDracutModules: []string{ "prefixdevname", "prefixdevname-tools", + "ifcfg", }, } diff --git a/pkg/distro/rhel/rhel8/edge.go b/pkg/distro/rhel/rhel8/edge.go index c0ab527705..a7806957ff 100644 --- a/pkg/distro/rhel/rhel8/edge.go +++ b/pkg/distro/rhel/rhel8/edge.go @@ -130,6 +130,7 @@ func mkEdgeInstallerImgType(rd *rhel.Distribution) *rhel.ImageType { AdditionalDracutModules: []string{ "prefixdevname", "prefixdevname-tools", + "ifcfg", }, } it.RPMOSTree = true diff --git a/pkg/distro/rhel/rhel9/bare_metal.go b/pkg/distro/rhel/rhel9/bare_metal.go index 3702cf377e..7911413809 100644 --- a/pkg/distro/rhel/rhel9/bare_metal.go +++ b/pkg/distro/rhel/rhel9/bare_metal.go @@ -54,6 +54,7 @@ func mkImageInstallerImgType() *rhel.ImageType { "nvdimm", // non-volatile DIMM firmware (provides nfit, cuse, and nd_e820) "prefixdevname", "prefixdevname-tools", + "ifcfg", }, AdditionalDrivers: []string{ "cuse", diff --git a/pkg/distro/rhel/rhel9/edge.go b/pkg/distro/rhel/rhel9/edge.go index 740bd91cd6..f76c928b06 100644 --- a/pkg/distro/rhel/rhel9/edge.go +++ b/pkg/distro/rhel/rhel9/edge.go @@ -148,6 +148,7 @@ func mkEdgeInstallerImgType() *rhel.ImageType { "nvdimm", // non-volatile DIMM firmware (provides nfit, cuse, and nd_e820) "prefixdevname", "prefixdevname-tools", + "ifcfg", }, AdditionalDrivers: []string{ "cuse", diff --git a/pkg/manifest/anaconda_installer.go b/pkg/manifest/anaconda_installer.go index 764f04a721..e180df4f63 100644 --- a/pkg/manifest/anaconda_installer.go +++ b/pkg/manifest/anaconda_installer.go @@ -422,7 +422,6 @@ func dracutStageOptions(kernelVer string, biosdevname bool, additionalModules [] "convertfs", "network-manager", "network", - "ifcfg", "url-lib", "drm", "plymouth",