SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-functions: follow fedora dbus-daemon/dbus-broker rearrangements

Browse Source 
Apparently dbus.service is now a symlink to either dbus-broker.service
or dbus-daemon.service. Copy in the right target service in each case.
This commit is contained in:
Lennart Poettering
2019-04-30 09:18:23 +02:00
parent cb9ff7532b
commit 908665f4e9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-functions
+8 -5
View File
@@ -684,17 +684,20 @@ install_libnss() {
install_dbus() {
inst $ROOTLIBDIR/system/dbus.socket
# Fedora rawhide replaced dbus.service with dbus-daemon.service
if [ -f $ROOTLIBDIR/system/dbus-daemon.service ]; then
# Newer Fedora versions use dbus-broker by default. Let's install it is available.
if [ -f $ROOTLIBDIR/system/dbus-broker.service ]; then
inst $ROOTLIBDIR/system/dbus-broker.service
inst_symlink /etc/systemd/system/dbus.service
inst /usr/bin/dbus-broker
inst /usr/bin/dbus-broker-launch
elif [ -f $ROOTLIBDIR/system/dbus-daemon.service ]; then
# Fedora rawhide replaced dbus.service with dbus-daemon.service
inst $ROOTLIBDIR/system/dbus-daemon.service
# Alias symlink
inst_symlink /etc/systemd/system/dbus.service
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 \