Upgrade to Fedora release 40, dbus-broker fails to start

So, I saw the new release in Gnome Software’s Update section, and waited for it to download. But, since it was stuck, I canceled it, did a quick sudo dnf update --refresh, and finally sudo dnf system-upgrade download --releasever=40, encountered a few problems with font packages that couldn’t be installed, ignored, sudo dnf system-upgrade download --releasever=40 --allowerasing.

Everything was good, until sudo dnf system-upgrade reboot, which said it was already scheduled. So, I manually reboot, the system goes for the offline-upgrade, and then a few errors flew by me, the system started rebooting, and then boom it’s a lot of errors, starting with dbus-broker service failing to start, and thermald, bluetooth and then a lot of dependent services failed like gdm. Couldn’t boot.

So, I booted up a live usb with Garuda, mounted the disk and the partitions, and then chroot into it, did a sudo dnf update, with nothing critical, followed by a sudo dnf distro-sync --releasever=40 --allowerasing --best, which tried to install all the packages again, but failed with a long list of packages.

I check the journalctl for the journal of the reboot after the upgrade, and this is what I found:

May 24 02:59:17 home systemd[1]: Reached target system-update-pre.target - Offline System Upd
ate (Pre).
May 24 02:59:17 home systemd[1]: Starting dnf-system-upgrade.service - System Upgrade using D
NF...
May 24 02:59:17 home systemd[1]: Starting fwupd-offline-update.service - Updates device firmw
are whilst offline...
May 24 02:59:17 home systemd[1]: Starting packagekit-offline-update.service - Update the oper
ating system whilst offline...
May 24 02:59:17 home dbus-broker-launch[1116]: Invalid XML in /usr/share/dbus-1/system.d/com.system76.PowerDaemon.conf +5: not well-formed (invalid token)
May 24 02:59:17 home dbus-broker-launch[1116]: ERROR run @ ../src/launch/main.c +152: Return code 1
May 24 02:59:17 home dbus-broker-launch[1116]:       main @ ../src/launch/main.c +178
May 24 02:59:17 home dbus-broker-launch[1116]: Exiting due to fatal error: -131
May 24 02:59:17 home systemd[1]: dbus-broker.service: Main process exited, code=exited, status=1/FAILURE
May 24 02:59:17 home audit[1]: SERVICE_START pid=1 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 msg='unit=dbus-broker comm="systemd" exe="/usr/lib/systemd/systemd" hostname=? addr=? terminal=? res=failed'
May 24 02:59:17 home systemd[1]: dbus-broker.service: Failed with result 'exit-code'.
May 24 02:59:17 home systemd[1]: Failed to start dbus-broker.service - D-Bus System Message B

So, I was curious what was the invalid token in the /usr/share/dbus-1/system.d/com.system76.PowerDaemon.conf, here we go:

!DOCTYPE busconfig PUBLIC
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<<<<<<< HEAD
<policy group="adm">
<allow send_destination="com.system76.PowerDaemon"/>
<allow receive_sender="com.system76.PowerDaemon"/>
</policy>
<policy group="wheel">
<allow send_destination="com.system76.PowerDaemon"/>
<allow receive_sender="com.system76.PowerDaemon"/>
</policy>
=======
>>>>>>> upstream/master
<policy user="root">
<allow own="com.system76.PowerDaemon"/>
<allow own="org.freedesktop.UPower.PowerProfiles"/>
<allow own="net.hadess.PowerProfiles"/>
</policy>
<policy context="default">

What were the git conflict markers doing in the file? Also, after the sudo dnf distro-sync --releasever=40 --allowerasing --best exited they disappeared, so I guess the dbus-broker was updated this time, and chose the upstream changes.

Why did this happen? Am I safe to reboot into Fedora now? Or should I do something about the packages that failed?

Failed:
SDL2-2.28.5-1.fc39.i686                       SDL2-2.30.1-1.fc40.i686
VirtualBox-7.0.18-1.fc39.x86_64               VirtualBox-7.0.18-1.fc40.x86_64
bluez-libs-5.75-1.fc39.i686                   bluez-libs-5.76-1.fc40.i686
bottles-1:51.11-7.fc39.noarch                 bottles-1:51.11-7.fc40.noarch
cairo-1.18.0-1.fc39.i686                      cairo-1.18.0-3.fc40.i686
cairo-gobject-1.18.0-1.fc39.i686              cairo-gobject-1.18.0-3.fc40.i686
fontconfig-2.14.2-6.fc39.i686                 fontconfig-2.15.0-4.fc40.i686
freetype-2.13.1-2.fc39.i686                   freetype-2.13.2-5.fc40.i686
gd-2.3.3-12.fc39.i686                         gd-2.3.3-16.fc40.i686
gstreamer1-plugins-base-1.22.12-1.fc39.i686   gstreamer1-plugins-base-1.22.12-1.fc40.i686
gtk3-3.24.41-1.fc39.i686                      gtk3-3.24.41-1.fc40.i686
harfbuzz-8.2.1-2.fc39.i686                    harfbuzz-8.4.0-1.fc40.i686
hplip-gui-3.23.12-6.fc39.x86_64               hplip-gui-3.23.12-6.fc40.x86_64
iaito-5.8.8-3.fc39.x86_64                     iaito-5.8.8-6.fc40.x86_64
jupyterlab-4.0.11-1.fc39.noarch               jupyterlab-4.1.0-1.fc40.noarch
libFAudio-23.07-2.fc39.i686                   libFAudio-23.07-5.fc40.i686
libXft-2.3.8-3.fc39.i686                      libXft-2.3.8-6.fc40.i686
libatomic-13.2.1-7.fc39.i686                  libatomic-14.1.1-1.fc40.i686
libavif-0.11.1-11.fc39.i686                   libavif-1.0.4-1.fc40.i686
libcanberra-gtk3-0.30-32.fc39.i686            libcanberra-gtk3-0.30-35.fc40.i686
libdecor-0.2.2-1.fc39.i686                    libdecor-0.2.2-3.fc40.i686
libgomp-13.2.1-7.fc39.i686                    libgomp-14.1.1-1.fc40.i686
libgphoto2-2.5.31-1.fc39.i686                 libgphoto2-2.5.31-1.fc40.i686
liblc3-1.0.4-2.fc39.i686                      liblc3-1.1.1-1.fc40.i686
libsndfile-1.1.0-9.fc39.i686                  libsndfile-1.2.2-2.fc40.i686
libunistring1.0-1.0-2.fc39.i686               libunistring1.0-1.0-4.fc40.i686
llvm16-libs-16.0.6-5.fc39.i686                llvm16-libs-16.0.6-7.fc40.i686
lutris-0.5.17-2.fc40.x86_64                   lutris-0.5.17-3.fc39.x86_64
mesa-dri-drivers-23.3.6-1.fc39.i686           mesa-dri-drivers-24.0.8-1.fc40.i686
mesa-libOSMesa-23.3.6-1.fc39.i686             mesa-libOSMesa-24.0.8-1.fc40.i686
neovim-0.9.5-2.fc39.x86_64                    neovim-0.9.5-4.fc40.x86_64
nss-mdns-0.15.1-9.fc39.i686                   nss-mdns-0.15.1-11.fc40.i686
openssl-pkcs11-0.4.12-4.fc39.i686             openssl-pkcs11-0.4.12-8.fc40.i686
orc-0.4.33-3.fc39.i686                        orc-0.4.38-2.fc40.i686
pango-1.51.0-1.fc39.i686                      pango-1.52.2-1.fc40.i686
pipewire-1.0.6-1.fc39.i686                    pipewire-1.0.6-1.fc40.i686
pipewire-libs-1.0.6-1.fc39.i686               pipewire-libs-1.0.6-1.fc40.i686
pixman-0.42.2-2.fc39.i686                     pixman-0.43.4-1.fc40.i686
protontricks-1.11.0-2.fc39.noarch             protontricks-1.11.1-1.fc40.noarch
pulseaudio-libs-16.1-5.fc39.i686              pulseaudio-libs-16.1-7.fc40.i686
python3-pandas-1.5.3-7.fc39~bootstrap.x86_64  python3-pandas-2.2.1-1.fc40.x86_64
rav1e-libs-0.7.1-1.fc39.i686                  rav1e-libs-0.7.1-1.fc40.i686
svt-av1-libs-1.4.1-3.fc39.i686                svt-av1-libs-1.4.1-5.fc40.i686
vivaldi-stable-6.7.3329.29-1.x86_64           wine-core-9.1-1.fc39.i686
wine-core-9.1-1.fc39.x86_64                   wine-core-9.5-1.fc40.i686
wine-core-9.5-1.fc40.x86_64                   wine-pulseaudio-9.1-1.fc39.x86_64
wine-pulseaudio-9.5-1.fc40.x86_64

Added dnf-system-upgrade and removed gnome

Here’s a hotfix:

sudo wget -O /usr/share/dbus-1/\
system.d/com.system76.PowerDaemon.conf \
https://github.com/pop-os/system76-power/raw/\
master/data/com.system76.PowerDaemon.conf

Report this issue to where you installed that package from.