diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-07-21 20:09:15 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-12-12 16:22:16 +0000 |
| commit | a7babbf10f162c938e464247a964811ed7d03fef (patch) | |
| tree | 76739110ebe031210a22dc96be9633f7ae6825a1 /bus/tmpfiles.d | |
| parent | 7cd2354b993366f0b45b19cced9d220d9f336c39 (diff) | |
| download | dbus-a7babbf10f162c938e464247a964811ed7d03fef.tar.gz | |
bus/containers: Create a DBusServer and add it to the main loop
This means we can accept connections on the new socket. For now, we
don't process them and they get closed.
For the system bus (or root's session bus, where the difference is
harmless but makes automated testing easier), rely on system-wide
infrastructure to create /run/dbus/containers. The upstream dbus
distribution no longer contains integration glue for non-systemd boot
systems, but downstreams that maintain a non-systemd boot system and are
interested in the Containers interface should create /run/dbus/containers
during boot.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
Diffstat (limited to 'bus/tmpfiles.d')
| -rw-r--r-- | bus/tmpfiles.d/dbus.conf.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bus/tmpfiles.d/dbus.conf.in b/bus/tmpfiles.d/dbus.conf.in index 754f0220..6ebecb6d 100644 --- a/bus/tmpfiles.d/dbus.conf.in +++ b/bus/tmpfiles.d/dbus.conf.in @@ -3,3 +3,7 @@ # Make ${localstatedir}/lib/dbus/machine-id a symlink to /etc/machine-id # if it does not already exist L @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id - - - - /etc/machine-id + +# Create ${runstatedir}/dbus/containers owned by the system bus user. +# org.freedesktop.DBus.Containers1 uses this to create sockets. +d @EXPANDED_RUNSTATEDIR@/dbus/containers 0755 @DBUS_USER@ - - - |