Commit 273357a3 authored by Jan Rybar's avatar Jan Rybar
Browse files

Move D-Bus policy file to /usr/share/dbus-1/system.d/

To better support stateless systems with an empty /etc, the old location
in /etc/dbus-1/system.d/ should only be used for local admin changes.
Package provided D-Bus policy files are supposed to be installed in
/usr/share/dbus-1/system.d/.

This is supported since dbus 1.9.18.

https://lists.freedesktop.org/archives/dbus/2015-July/016746.html
parent d05a1677
......@@ -15,7 +15,7 @@ $(service_DATA): $(service_in_files) Makefile
# ----------------------------------------------------------------------------------------------------
dbusconfdir = $(sysconfdir)/dbus-1/system.d
dbusconfdir = $(datadir)/dbus-1/system.d
dbusconf_in_files = org.freedesktop.PolicyKit1.conf.in
dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
......
......@@ -129,8 +129,8 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
mozjs_dep = dependency('mozjs-78')
dbus_dep = dependency('dbus-1')
dbus_sysconfdir = dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', pk_prefix / pk_sysconfdir])
dbus_policydir = dbus_sysconfdir / 'dbus-1/system.d'
dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838
dbus_policydir = dbus_confdir / 'dbus-1/system.d'
dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
# check OS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment