picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: use pkg-config to get user unit dir when installing dbus user socket 

Usually on Debian ROOTLIBDIR is /lib/<arch triplet>, which is not the right place.
Use pkg-config since we define it, and then fallback to /usr/lib/systemd/user which is
the canonical location.
On both Debian&friends and Fedora dbus/dbus-broker install the user socket/service
under /usr/lib/systemd/user, not /lib/systemd/systemd/user.
This commit is contained in:
Luca Boccassi 2020-12-22 17:47:39 +00:00
parent bb64bec589
commit 53a1c94480
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/test-functions
View File

@ -1058,8 +1058,14 @@ EOF
} }
install_user_dbus() { install_user_dbus() {
inst $ROOTLIBDIR/user/dbus.socket local userunitdir
inst_symlink /usr/lib/systemd/user/sockets.target.wants/dbus.socket || inst_symlink /etc/systemd/user/sockets.target.wants/dbus.socket if ! userunitdir=$(pkg-config --variable=systemduserunitdir systemd); then
echo "WARNING! Cannot determine userunitdir from pkg-config, assuming /usr/lib/systemd/user" >&2
local userunitdir=/usr/lib/systemd/user
fi
inst $userunitdir/dbus.socket
inst_symlink $userunitdir/sockets.target.wants/dbus.socket || inst_symlink /etc/systemd/user/sockets.target.wants/dbus.socket
# Append the After= dependency on dbus in case it isn't already set up # Append the After= dependency on dbus in case it isn't already set up
mkdir -p "$initdir/etc/systemd/system/user@.service.d/" mkdir -p "$initdir/etc/systemd/system/user@.service.d/"
@ -1069,16 +1075,16 @@ After=dbus.service
EOF EOF
# Newer Fedora versions use dbus-broker by default. Let's install it if it's available. # Newer Fedora versions use dbus-broker by default. Let's install it if it's available.
if [ -f $ROOTLIBDIR/user/dbus-broker.service ]; then if [ -f $userunitdir/dbus-broker.service ]; then
inst $ROOTLIBDIR/user/dbus-broker.service inst $userunitdir/dbus-broker.service
inst_symlink /etc/systemd/user/dbus.service inst_symlink /etc/systemd/user/dbus.service
elif [ -f $ROOTLIBDIR/system/dbus-daemon.service ]; then elif [ -f $ROOTLIBDIR/system/dbus-daemon.service ]; then
# Fedora rawhide replaced dbus.service with dbus-daemon.service # Fedora rawhide replaced dbus.service with dbus-daemon.service
inst $ROOTLIBDIR/user/dbus-daemon.service inst $userunitdir/dbus-daemon.service
# Alias symlink # Alias symlink
inst_symlink /etc/systemd/user/dbus.service inst_symlink /etc/systemd/user/dbus.service
else else
inst $ROOTLIBDIR/user/dbus.service inst $userunitdir/dbus.service
fi fi
} }