1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00

tests: dbus.service was renamed to dbus-daemon.service in Rawhide

Fedora Rawhide renamed dbus.service to dbus-daemon.service - that
breaks tests which require working DBus (e.g. TEST-03-JOBS)

Excerpt from the dbus.spec:
The 'dbus' package is only retained for compatibility purposes. It will
eventually be removed and then replaced by 'Provides: dbus' in the
dbus-daemon package. It will then exclusively be used for other packages to
describe their dependency on a system and user bus. It does not pull in any
particular dbus *implementation*, nor any libraries. These should be pulled
in, if required, via explicit dependencies.
This commit is contained in:
Frantisek Sumsal 2018-11-11 12:13:48 +01:00 committed by Lennart Poettering
parent 7d7c8ea944
commit a978c9f292

View File

@ -590,7 +590,15 @@ install_libnss() {
install_dbus() {
inst $ROOTLIBDIR/system/dbus.socket
inst $ROOTLIBDIR/system/dbus.service
# Fedora rawhide replaced dbus.service with dbus-daemon.service
if [ -f $ROOTLIBDIR/system/dbus-daemon.service ]; then
inst $ROOTLIBDIR/system/dbus-daemon.service
# Alias symlink
inst_symlink /etc/systemd/system/dbus.service
else
inst $ROOTLIBDIR/system/dbus.service
fi
find \
/etc/dbus-1 /usr/share/dbus-1 -xtype f \