summaryrefslogtreecommitdiffstats
path: root/core/modules/dbus
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-11 12:39:29 +0200
committerSimon Rettberg2020-08-11 12:39:29 +0200
commit27bf03b5125506652b4c57fc779d523e2fd1dfb6 (patch)
tree664fc59557b72c5d6c25136aa2bc445d0d13336d /core/modules/dbus
parent[kiosk-chromium] SLX_BROWSER_RELOAD_SECS == 0 means OFF (diff)
downloadmltk-27bf03b5125506652b4c57fc779d523e2fd1dfb6.tar.gz
mltk-27bf03b5125506652b4c57fc779d523e2fd1dfb6.tar.xz
mltk-27bf03b5125506652b4c57fc779d523e2fd1dfb6.zip
[dbus] Force proper DBUS_SESSION_BUS_ADDRESS everywhere
Diffstat (limited to 'core/modules/dbus')
-rw-r--r--core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment3
-rw-r--r--core/modules/dbus/data/etc/systemd/system/user@.service.d/dbus-session-path.conf2
-rw-r--r--core/modules/dbus/data/opt/openslx/lightdm/autologin.d/00-import-systemd-environment3
3 files changed, 8 insertions, 0 deletions
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