diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-13 16:07:47 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-14 15:52:38 +0100 |
| commit | 98b0439f086323a441f00227b88513da86bfd1a7 (patch) | |
| tree | d526f043e576771eec85d5ecf235392d05f3c9bc /test | |
| parent | 1e46047066e57bf886d97624ebd397198da815a7 (diff) | |
| download | systemd-98b0439f086323a441f00227b88513da86bfd1a7.tar.gz | |
tests: install /usr/bin/dbus-broker when using dbus-broker
We'd install the service file, and then dbus-broker-launcher because it is
mentioned in ExecStart=, but not the main executable, so nothing would work.
Let's just install dbus-broker executables if found. They are small, so this
doesn't matter much, and is much easier than figuring the exact conditions
under which dbus-broker will be used instead of dbus-daemon.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/test-functions b/test/test-functions index 2790b8a6be..c2a12c5615 100644 --- a/test/test-functions +++ b/test/test-functions @@ -672,6 +672,9 @@ install_dbus() { else inst $ROOTLIBDIR/system/dbus.service fi + # Newer Fedora versions use dbus-broker by default. Let's install it is available. + [ -f /usr/bin/dbus-broker ] && inst /usr/bin/dbus-broker + [ -f /usr/bin/dbus-broker-launch ] && inst /usr/bin/dbus-broker-launch find \ /etc/dbus-1 /usr/share/dbus-1 -xtype f \ |