diff options
author | 2015-08-31 18:07:46 +0200 | |
---|---|---|
committer | 2015-08-31 18:12:37 +0200 | |
commit | 3df49c2877757d41e8b00adf697735837b8f6c07 (patch) | |
tree | c94218a7f1863a6154aff91de339bd97926b6922 /xorg | |
parent | Merge pull request #1093 from poettering/unified-prepare (diff) | |
download | systemd-3df49c2877757d41e8b00adf697735837b8f6c07.tar.gz systemd-3df49c2877757d41e8b00adf697735837b8f6c07.tar.bz2 systemd-3df49c2877757d41e8b00adf697735837b8f6c07.zip |
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 <jan.steffens@gmail.com>
Diffstat (limited to 'xorg')
-rwxr-xr-x | xorg/50-systemd-user.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg/50-systemd-user.sh b/xorg/50-systemd-user.sh index f4df13b61..4d4976722 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 |