summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-06 10:02:53 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-06 10:02:55 +0000
commit5d2794f63ffe10c54c00154a485cc4eb78129fa4 (patch)
tree9a11062d309fa09c966ccd172ddc7a7bbc4491dd
parentea431f4e844bd85e4d7830ec1e7afce39e33af11 (diff)
downloaddefinitions-5d2794f63ffe10c54c00154a485cc4eb78129fa4.tar.gz
Completely untested add systemd user dbus config
When it comes time to upstreaming, a lot of this will probably be moved into the dbus chunk.
-rw-r--r--essential-files/etc/systemd/system/user@.service.d/dbus.conf4
-rw-r--r--essential-files/etc/systemd/user/dbus.service7
-rw-r--r--essential-files/etc/systemd/user/dbus.socket9
-rw-r--r--essential-files/manifest7
4 files changed, 27 insertions, 0 deletions
diff --git a/essential-files/etc/systemd/system/user@.service.d/dbus.conf b/essential-files/etc/systemd/system/user@.service.d/dbus.conf
new file mode 100644
index 00000000..a9b0b357
--- /dev/null
+++ b/essential-files/etc/systemd/system/user@.service.d/dbus.conf
@@ -0,0 +1,4 @@
+[Service]
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Environment=QT_QPA_PLATFORM=wayland-egl
+Environment=WAYLAND_DISPLAY=wayland-%I
diff --git a/essential-files/etc/systemd/user/dbus.service b/essential-files/etc/systemd/user/dbus.service
new file mode 100644
index 00000000..1851818f
--- /dev/null
+++ b/essential-files/etc/systemd/user/dbus.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=D-Bus Message Bus
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation
+ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
diff --git a/essential-files/etc/systemd/user/dbus.socket b/essential-files/etc/systemd/user/dbus.socket
new file mode 100644
index 00000000..3eaa0c63
--- /dev/null
+++ b/essential-files/etc/systemd/user/dbus.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=D-Bus Message Bus Socket
+Before=sockets.target
+
+[Socket]
+ListenStream=%t/dbus/user_bus_socket
+
+[Install]
+WantedBy=default.target
diff --git a/essential-files/manifest b/essential-files/manifest
index 1294534f..e1a6bc39 100644
--- a/essential-files/manifest
+++ b/essential-files/manifest
@@ -1,3 +1,10 @@
0040755 0 0 /etc
overwrite 0100644 0 0 /etc/os-release
overwrite 0100644 0 0 /etc/profile
+0040755 0 0 /etc/systemd
+0040755 0 0 /etc/systemd/system
+0040755 0 0 /etc/systemd/system/user@.service.d
+0100644 0 0 /etc/systemd/system/user@.service.d/dbus.conf
+0040755 0 0 /etc/systemd/user
+0100644 0 0 /etc/systemd/user/dbus.service
+0100644 0 0 /etc/systemd/user/dbus.socket