Skip to content

Commit 3129bea

Browse files
mrc0mmandbluca
authored andcommitted
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 ec6c7ba) (cherry picked from commit 7b80fc2)
1 parent 8e8c9f0 commit 3129bea

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/test-functions

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,14 +2094,14 @@ install_dbus() {
20942094
# Newer Fedora versions use dbus-broker by default. Let's install it if it's available.
20952095
if [ -f "$ROOTLIBDIR/system/dbus-broker.service" ]; then
20962096
inst "$ROOTLIBDIR/system/dbus-broker.service"
2097-
inst_symlink /etc/systemd/system/dbus.service
20982097
inst /usr/bin/dbus-broker
20992098
inst /usr/bin/dbus-broker-launch
2099+
image_install -o {/etc,/usr/lib}/systemd/system/dbus.service
21002100
elif [ -f "$ROOTLIBDIR/system/dbus-daemon.service" ]; then
21012101
# Fedora rawhide replaced dbus.service with dbus-daemon.service
21022102
inst "$ROOTLIBDIR/system/dbus-daemon.service"
21032103
# Alias symlink
2104-
inst_symlink /etc/systemd/system/dbus.service
2104+
image_install -o {/etc,/usr/lib}/systemd/system/dbus.service
21052105
else
21062106
inst "$ROOTLIBDIR/system/dbus.service"
21072107
fi
@@ -2160,12 +2160,12 @@ EOF
21602160
# Newer Fedora versions use dbus-broker by default. Let's install it if it's available.
21612161
if [ -f "$userunitdir/dbus-broker.service" ]; then
21622162
inst "$userunitdir/dbus-broker.service"
2163-
inst_symlink /etc/systemd/user/dbus.service
2163+
image_install -o {/etc,/usr/lib}/systemd/user/dbus.service
21642164
elif [ -f "${ROOTLIBDIR:?}/system/dbus-daemon.service" ]; then
21652165
# Fedora rawhide replaced dbus.service with dbus-daemon.service
21662166
inst "$userunitdir/dbus-daemon.service"
21672167
# Alias symlink
2168-
inst_symlink /etc/systemd/user/dbus.service
2168+
image_install -o {/etc,/usr/lib}/systemd/user/dbus.service
21692169
else
21702170
inst "$userunitdir/dbus.service"
21712171
fi

0 commit comments

Comments
 (0)