From 3df49c2877757d41e8b00adf697735837b8f6c07 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 31 Aug 2015 18:07:46 +0200 Subject: login: support user-bus on dbus1 dbus-1.10 was just released, including systemd units to run `dbus-daemon --session` as systemd user unit. This allows using a user-bus with dbus1, just like we do per default with kdbus. All the dbus libraries have already been fixed long ago to use the user-bus as default. Hence, there's no need to set DBUS_SESSION_BUS_ADDRESS= if we use the user-bus. However, gdm and friends continue to spawn a session bus if this variable is not set (instead of checking for the existence of the user-bus). Hence, we force the user-bus, if it is available, in pam_systemd. Once gdm and friends are fixed, we can continue to drop this again. However, that might take a while. With this in place, all that is needed to make the user-bus work is: `systemctl --global enable dbus.socket` If dbus.socket is not enabled, the legacy session-bus is still used. Based on a patch by: Jan Alexander Steffens --- xorg/50-systemd-user.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xorg/50-systemd-user.sh') diff --git a/xorg/50-systemd-user.sh b/xorg/50-systemd-user.sh index f4df13b619..4d49767228 100755 --- a/xorg/50-systemd-user.sh +++ b/xorg/50-systemd-user.sh @@ -1,3 +1,7 @@ #!/bin/sh systemctl --user import-environment DISPLAY XAUTHORITY + +if which dbus-update-activation-environment >/dev/null 2>&1; then + dbus-update-activation-environment DISPLAY XAUTHORITY +fi -- cgit v1.2.3-54-g00ecf