Skip to content

Commit

Permalink
daemon: Also override kernel-modules-core
Browse files Browse the repository at this point in the history
Unfortunately rpm-ostree requires this right now; we have an issue
and code to provide a better API in coreos/rpm-ostree#2542
But using that will require shipping the updated rpm-ostree in RHEL 8.6.z
or at least OCP 4.12.z, which is problematic.

Because we know the new MCD will always be upgrading to RHEL9,
for now let's update this hardcoded list.  In the future we can
detect when the running host has `--remove-installed-kernel` and
use it instead.
  • Loading branch information
cgwalters committed Mar 4, 2023
1 parent 7e16837 commit 4e9fca2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/daemon/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ func (dn *CoreOSDaemon) switchKernel(newConfig *mcfgv1.MachineConfig) error {
}

// TODO: Drop this code and use https://github.com/coreos/rpm-ostree/issues/2542 instead
defaultKernel := []string{"kernel", "kernel-core", "kernel-modules", "kernel-modules-extra"}
defaultKernel := []string{"kernel", "kernel-core", "kernel-modules", "kernel-modules-core", "kernel-modules-extra"}
// Note this list explicitly does *not* include kernel-rt as that is a meta-package that tries to pull in a lot
// of other dependencies we don't want for historical reasons.
// kernel-rt also has a split off kernel-rt-kvm subpackage because it's in a separate subscription in RHEL.
Expand Down

0 comments on commit 4e9fca2

Please sign in to comment.