summaryrefslogtreecommitdiffstats
path: root/core/modules/dbus
diff options
context:
space:
mode:
authorSimon Rettberg2021-10-29 15:54:00 +0200
committerYour Name2021-10-29 15:54:00 +0200
commit8c648dbdb31c46a82ea73f9fc65921b233e36599 (patch)
treeb7e7f068f09f7ee68cb50645e749b41579cfad53 /core/modules/dbus
parent[vmware-common/vbox-src] Make systemctl start non-blocking (diff)
downloadmltk-8c648dbdb31c46a82ea73f9fc65921b233e36599.tar.gz
mltk-8c648dbdb31c46a82ea73f9fc65921b233e36599.tar.xz
mltk-8c648dbdb31c46a82ea73f9fc65921b233e36599.zip
[dbus] Fix session environment, add missing service/socket file
Diffstat (limited to 'core/modules/dbus')
-rw-r--r--core/modules/dbus/data/etc/X11/Xsession.d/00-import-systemd-environment1
-rw-r--r--core/modules/dbus/module.conf1
2 files changed, 2 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
index b747d60f..2df58335 100644
--- 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
@@ -1,3 +1,4 @@
#!/bin/ash
+export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
diff --git a/core/modules/dbus/module.conf b/core/modules/dbus/module.conf
index 174f19a5..093d5cce 100644
--- a/core/modules/dbus/module.conf
+++ b/core/modules/dbus/module.conf
@@ -11,6 +11,7 @@ REQUIRED_BINARIES="
REQUIRED_DIRECTORIES="
/etc/dbus-1
/usr/share/dbus-1
+ /usr/lib/systemd/user
"
REQUIRED_FILES="
/lib/systemd/system/dbus.service