diff --git a/pkg/distro/fedora/images.go b/pkg/distro/fedora/images.go index 43215858ab..2bc6181776 100644 --- a/pkg/distro/fedora/images.go +++ b/pkg/distro/fedora/images.go @@ -525,6 +525,7 @@ func iotImage(workload workload.Workload, img.LockRoot = true if !common.VersionLessThan(distro.Releasever(), "38") { + img.KernelOptionsAppend = append(img.KernelOptionsAppend, "coreos.no_persist_ip") switch img.Platform.GetImageFormat() { case platform.FORMAT_RAW: img.IgnitionPlatform = "metal" @@ -589,6 +590,7 @@ func iotSimplifiedInstallerImage(workload workload.Workload, if !common.VersionLessThan(t.arch.distro.osVersion, "38") { rawImg.IgnitionPlatform = "metal" + rawImg.KernelOptionsAppend = append(rawImg.KernelOptionsAppend, "coreos.no_persist_ip") if bpIgnition := customizations.GetIgnition(); bpIgnition != nil && bpIgnition.FirstBoot != nil && bpIgnition.FirstBoot.ProvisioningURL != "" { rawImg.KernelOptionsAppend = append(rawImg.KernelOptionsAppend, "ignition.config.url="+bpIgnition.FirstBoot.ProvisioningURL) } diff --git a/pkg/distro/rhel9/images.go b/pkg/distro/rhel9/images.go index 3cfa8839ef..9d9ff97f0b 100644 --- a/pkg/distro/rhel9/images.go +++ b/pkg/distro/rhel9/images.go @@ -422,6 +422,7 @@ func edgeRawImage(workload workload.Workload, if !common.VersionLessThan(t.arch.distro.osVersion, "9.2") || !t.arch.distro.isRHEL() { img.IgnitionPlatform = "metal" + img.KernelOptionsAppend = append(img.KernelOptionsAppend, "coreos.no_persist_ip") if bpIgnition := customizations.GetIgnition(); bpIgnition != nil && bpIgnition.FirstBoot != nil && bpIgnition.FirstBoot.ProvisioningURL != "" { img.KernelOptionsAppend = append(img.KernelOptionsAppend, "ignition.config.url="+bpIgnition.FirstBoot.ProvisioningURL) } @@ -492,6 +493,7 @@ func edgeSimplifiedInstallerImage(workload workload.Workload, if !common.VersionLessThan(t.arch.distro.osVersion, "9.2") || !t.arch.distro.isRHEL() { rawImg.IgnitionPlatform = "metal" + rawImg.KernelOptionsAppend = append(rawImg.KernelOptionsAppend, "coreos.no_persist_ip") if bpIgnition := customizations.GetIgnition(); bpIgnition != nil && bpIgnition.FirstBoot != nil && bpIgnition.FirstBoot.ProvisioningURL != "" { rawImg.KernelOptionsAppend = append(rawImg.KernelOptionsAppend, "ignition.config.url="+bpIgnition.FirstBoot.ProvisioningURL) } diff --git a/pkg/manifest/ostree_deployment.go b/pkg/manifest/ostree_deployment.go index a15d10133f..18dc7d92ba 100644 --- a/pkg/manifest/ostree_deployment.go +++ b/pkg/manifest/ostree_deployment.go @@ -203,7 +203,6 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { if p.IgnitionPlatform != "" { kernelOpts = append(kernelOpts, - "coreos.no_persist_ip", // users cannot add connections as we don't have a live iso, this prevents connections to bleed into the system from the ign initrd "ignition.platform.id="+p.IgnitionPlatform, "$ignition_firstboot", )