@@ -1735,10 +1735,7 @@ func (dn *CoreOSDaemon) switchKernel(oldConfig, newConfig *mcfgv1.MachineConfig)
17351735 logSystem ("Re-applying kernel type %s" , newKtype )
17361736 }
17371737
1738- kernelPackages , err := dn .getKernelPackagesForTargetRelease ()
1739- if err != nil {
1740- return fmt .Errorf ("failed to get kernel packages for target release: %w" , err )
1741- }
1738+ kernelPackages := dn .getKernelPackagesForTargetRelease ()
17421739 if newKtype == ctrlcommon .KernelTypeRealtime {
17431740 // Switch to RT kernel
17441741 args := []string {"override" , "remove" }
@@ -1762,36 +1759,17 @@ func (dn *CoreOSDaemon) switchKernel(oldConfig, newConfig *mcfgv1.MachineConfig)
17621759}
17631760
17641761// getKernelPackagesForTargetRelease returns the list of kernel packaged for the running OS release.
1765- func (dn * CoreOSDaemon ) getKernelPackagesForTargetRelease () ( releaseKernelPackages , error ) {
1762+ func (dn * CoreOSDaemon ) getKernelPackagesForTargetRelease () releaseKernelPackages {
17661763 // TODO: Drop this code and use https://github.com/coreos/rpm-ostree/issues/2542 instead
17671764
1768- // Fetch the OS deployments to infer the target OS version from them
1769- booted , staged , err := dn .NodeUpdaterClient .GetBootedAndStagedDeployment ()
1770- if err != nil {
1771- return releaseKernelPackages {}, fmt .Errorf ("error fetching OS deployments : %v" , err )
1772- }
1773-
1774- // If there's a staged deployment the packages will be installed in it instead of in the current booted deployment
1775- targetDeployment := booted
1776- if staged != nil {
1777- targetDeployment = staged
1778- }
1779-
17801765 kernelPackages := releaseKernelPackages {
17811766 defaultKernel : []string {"kernel" , "kernel-core" , "kernel-modules" , "kernel-modules-core" , "kernel-modules-extra" },
17821767 hugePagesKernel : []string {"kernel-64k-core" , "kernel-64k-modules" , "kernel-64k-modules-core" , "kernel-64k-modules-extra" },
17831768 // Note this list explicitly does *not* include kernel-rt as that is a meta-package that tries to pull in a lot
17841769 // of other dependencies we don't want for historical reasons.
17851770 realtimeKernel : []string {"kernel-rt-core" , "kernel-rt-modules" , "kernel-rt-modules-extra" },
17861771 }
1787-
1788- // RHEL10 early bugfix of OCPBUGS-62925
1789- // RHEL10 doesn't ship with kernel-rt-kvm
1790- targetVersion := NewTargetOSVersionFromDeployment (targetDeployment )
1791- if ! targetVersion .IsEL10 () {
1792- kernelPackages .realtimeKernel = append (kernelPackages .realtimeKernel , "kernel-rt-kvm" )
1793- }
1794- return kernelPackages , nil
1772+ return kernelPackages
17951773}
17961774
17971775// updateFiles writes files specified by the nodeconfig to disk. it also writes
0 commit comments