diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-01 19:17:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-02 11:24:05 +0100 |
| commit | d0f46841380bd55028fcc67bf8b6ef2bdd42f36b (patch) | |
| tree | 7826b1cf035299e473976687a9ba4dd70526e8e0 /bus/system.conf.in | |
| parent | 694d63b679b03d685126b72294adde6fba28aebf (diff) | |
| download | dbus-d0f46841380bd55028fcc67bf8b6ef2bdd42f36b.tar.gz | |
On Windows, load local configuration relative to bus setup
This makes an installed tree with
/some-prefix/
etc/
dbus-1/
session-local.conf
share/
dbus-1/
session.conf
relocatable to any location.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Tested-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'bus/system.conf.in')
| -rw-r--r-- | bus/system.conf.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bus/system.conf.in b/bus/system.conf.in index 3679115e..014f67ee 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -98,17 +98,17 @@ </policy> <!-- Include legacy configuration location --> - <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system.conf</include> + <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system.conf</include> <!-- Config files are placed here that among other things, punch holes in the above policy for specific services. --> <includedir>system.d</includedir> - <includedir>@DBUS_SYSCONFDIR@/dbus-1/system.d</includedir> + <includedir>@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system.d</includedir> <!-- This is included last so local configuration can override what's in this standard file --> - <include ignore_missing="yes">@DBUS_SYSCONFDIR@/dbus-1/system-local.conf</include> + <include ignore_missing="yes">@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/system-local.conf</include> <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> |