diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2018-11-11 12:13:48 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-12 19:16:55 +0100 |
| commit | a978c9f292291f3ee3caa37ab61f382fd60aef52 (patch) | |
| tree | 3d8cc8513e08b0fc0cc2310c76f0f6d702354178 | |
| parent | 7d7c8ea9443b501f3f8c7b455d2aadc48f2ebc35 (diff) | |
| download | systemd-a978c9f292291f3ee3caa37ab61f382fd60aef52.tar.gz | |
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.
| -rw-r--r-- | test/test-functions | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 49c444e52b..37069396b7 100644 --- a/test/test-functions +++ b/test/test-functions @@ -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 \ |