fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-06 09:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-containers-dir' into 'master'

Browse source 
bus: Don't create /run/dbus/containers if the feature is disabled

See merge request dbus/dbus!488
This commit is contained in:
Simon McVittie 2024-11-19 11:28:51 +00:00
commit 1f5affa322
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bus/tmpfiles.d/dbus-containers.conf.in Normal file
View file

@ -0,0 +1,5 @@
# Fields: type; path; mode; uid; gid; age; argument (symlink target)
# 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@ - - -

4
bus/tmpfiles.d/dbus.conf.in
View file

@ -7,7 +7,3 @@ d @EXPANDED_LOCALSTATEDIR@/lib/dbus 0755 - - -
# 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@ - - -

9
bus/tmpfiles.d/meson.build
View file

@ -25,3 +25,12 @@ configure_file(
configuration: data_config,
install_dir: get_option('prefix') / 'lib' / 'tmpfiles.d',
)
if get_option('containers')
configure_file(
input: 'dbus-containers.conf.in',
output: 'dbus-containers.conf',
configuration: data_config,
install_dir: get_option('prefix') / 'lib' / 'tmpfiles.d',
)
endif