From 74c7ed0fdff19e015be41ce640d964327cebfdba Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 11 Jan 2024 11:02:05 +0100 Subject: [PATCH] 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] https://gitlab.archlinux.org/archlinux/packaging/packages/dbus-broker/-/commit/b24d15795addeb15f9532f28deae9475fad8b9fa (cherry picked from commit ec6c7bac5c92b26fc17ad165d2defc85da324391) (cherry picked from commit 7b80fc2587d542b65e0ebc5cece9fca7cf83432a) (cherry picked from commit 3129beaf0ccb9f9f34737f54ca50e1d0d873bde3) (cherry picked from commit ec2d0d691e4a3f006fcac50132e88aefa6262d0e) --- test/test-functions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test-functions b/test/test-functions index 1d44b63d95..73fbef81d1 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1993,14 +1993,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 @@ -2059,12 +2059,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