Bluefin with Surface kernel fails to update due to OSTree error "Multiple kernels found"

[SvdB-nonp]

Describe the bug

When I start the application "System Update", the subsequent update fails with error message error: Committing: Multiple kernels found in /usr/lib/modules

Terminal output during the failing update:

── 13:10:27 - System update ────────────────────────────────────────────────────
note: automatic updates (stage) are enabled
Pulling manifest: ostree-image-signed:docker://ghcr.io/ublue-os/bluefin-surface:gts
Checking out tree 052041c... done
Writing OSTree commit... done
error: Committing: Multiple kernels found in /usr/lib/modules
System update failed: 
   0: Command failed: `/usr/bin/rpm-ostree upgrade`
   1: `/usr/bin/rpm-ostree` failed: exit status: 1

Location:
   src/steps/os/linux.rs:273
Retry? (y)es/(N)o/(s)hell/(q)uit

The location mentioned in the error message contains the following files:

ls -lart /usr/lib/modules
total 0
drwxr-xr-x. 1 root root 770  1 jan  1970 6.8.8-1.surface.fc39.x86_64
drwxr-xr-x. 1 root root 834  1 jan  1970 ..
drwxr-xr-x. 1 root root  54  1 jan  1970 .

What did you expect to happen?

The update finishes successfully without errors.

Output of rpm-ostree status

State: idle
AutomaticUpdates: stage; rpm-ostreed-automatic.timer: no runs since boot
Deployments:
● ostree-image-signed:docker://ghcr.io/ublue-os/bluefin-surface:gts
                   Digest: sha256:1306f0d05c5ce1a6b8be69793a22493cc89f3c285597a94b6fd9643ec5eb0639
                  Version: 39.20240525.0 (2024-05-25T16:49:38Z)
             InitramfsEtc: /etc/crypttab /etc/modules-load.d/ublue-surface.conf

  ostree-image-signed:docker://ghcr.io/ublue-os/bluefin-surface:gts
                   Digest: sha256:3eb6f5ff8e913046544f8f6fdf78b2ec4f0d80ebedf99ef019e1229e18a24d50
                  Version: 39.20240524.0 (2024-05-24T16:49:28Z)
             InitramfsEtc: /etc/crypttab /etc/modules-load.d/ublue-surface.conf

Output of groups

stefanvandenberg wheel

Extra information or context

Links

• ujust device-info link to pastebin: https://paste.centos.org/view/69127aaf
• Discourse: https://universal-blue.discourse.group/t/cannot-update-aurora-surface-multiple-kernels-found-in-usr-lib-modules/1954
• Discord: https://discord.com/channels/1072614816579063828/1087140903031943178/1245335380014792805