mirror of
https://github.com/systemd/systemd
synced 2024-07-21 02:05:05 +00:00
test: fix dbus installation on Arch
Arch finally made dbus-broker the default dbus daemon [0], but unlike
Fedora they don't use Alias=dbus.service to make the dbus.symlink under
/etc, instead they create the symlink manually under /usr/lib, so let's
account for that.
[0] b24d15795a
This commit is contained in:
parent
1c585a4ccd
commit
ec6c7bac5c
|
@ -2196,14 +2196,14 @@ install_dbus() {
|
|||
# Newer Fedora versions use dbus-broker by default. Let's install it if it's 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
|
||||
image_install -o {/etc,/usr/lib}/systemd/system/dbus.service
|
||||
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
|
||||
image_install -o {/etc,/usr/lib}/systemd/system/dbus.service
|
||||
else
|
||||
inst "$ROOTLIBDIR/system/dbus.service"
|
||||
fi
|
||||
|
@ -2262,12 +2262,12 @@ EOF
|
|||
# Newer Fedora versions use dbus-broker by default. Let's install it if it's available.
|
||||
if [ -f "$userunitdir/dbus-broker.service" ]; then
|
||||
inst "$userunitdir/dbus-broker.service"
|
||||
inst_symlink /etc/systemd/user/dbus.service
|
||||
image_install -o {/etc,/usr/lib}/systemd/user/dbus.service
|
||||
elif [ -f "${ROOTLIBDIR:?}/system/dbus-daemon.service" ]; then
|
||||
# Fedora rawhide replaced dbus.service with dbus-daemon.service
|
||||
inst "$userunitdir/dbus-daemon.service"
|
||||
# Alias symlink
|
||||
inst_symlink /etc/systemd/user/dbus.service
|
||||
image_install -o {/etc,/usr/lib}/systemd/user/dbus.service
|
||||
else
|
||||
inst "$userunitdir/dbus.service"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue