From 27bf03b5125506652b4c57fc779d523e2fd1dfb6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 11 Aug 2020 12:39:29 +0200
Subject: [dbus] Force proper DBUS_SESSION_BUS_ADDRESS everywhere

---
 .../modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment | 3 +++
 .../data/etc/systemd/system/user@.service.d/dbus-session-path.conf     | 2 ++
 .../data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment | 3 +++
 3 files changed, 8 insertions(+)
 create mode 100644 core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment
 create mode 100644 core/modules/dbus/data/etc/systemd/system/user@.service.d/dbus-session-path.conf
 create mode 100644 core/modules/dbus/data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment

(limited to 'core/modules/dbus')

diff --git a/core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment b/core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment
new file mode 100644
index 00000000..b747d60f
--- /dev/null
+++ b/core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment
@@ -0,0 +1,3 @@
+#!/bin/ash
+
+systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
diff --git a/core/modules/dbus/data/etc/systemd/system/user@.service.d/dbus-session-path.conf b/core/modules/dbus/data/etc/systemd/system/user@.service.d/dbus-session-path.conf
new file mode 100644
index 00000000..1be26c2b
--- /dev/null
+++ b/core/modules/dbus/data/etc/systemd/system/user@.service.d/dbus-session-path.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus"
diff --git a/core/modules/dbus/data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment b/core/modules/dbus/data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment
new file mode 100644
index 00000000..b747d60f
--- /dev/null
+++ b/core/modules/dbus/data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment
@@ -0,0 +1,3 @@
+#!/bin/ash
+
+systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
-- 
cgit v1.2.3-55-g7522