diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-02-25 15:39:04 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-27 11:49:34 +0100 |
| commit | b2c61ca6ea2dd9ba62ebddc98fa295ee84ab3949 (patch) | |
| tree | 162c3ec61692523c8e6806c9ac030f066965cef4 /bus/legacy-config | |
| parent | 4cbe3019c727380ec8734b7d2aa5a02e251d1489 (diff) | |
| download | dbus-b2c61ca6ea2dd9ba62ebddc98fa295ee84ab3949.tar.gz | |
Move session & system bus configuration to datadir, by default.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus/legacy-config')
| -rw-r--r-- | bus/legacy-config/session.conf.in | 20 | ||||
| -rw-r--r-- | bus/legacy-config/system.conf.in | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/bus/legacy-config/session.conf.in b/bus/legacy-config/session.conf.in new file mode 100644 index 00000000..aaea9104 --- /dev/null +++ b/bus/legacy-config/session.conf.in @@ -0,0 +1,20 @@ +<!-- +This configuration file is no longer required and may be removed. + +In older versions of dbus, this file defined the behaviour of the well-known +session bus. That behaviour is now determined by +@DBUS_DATADIR@/dbus-1/session.conf, which should not be edited. + +For local configuration changes, create a file +@DBUS_SYSCONFDIR@/dbus-1/session-local.conf or files matching +@DBUS_SYSCONFDIR@/dbus-1/session.d/*.conf, with a <busconfig> +element containing configuration directives. These directives can +override D-Bus or OS defaults. + +For upstream or distribution-wide defaults that can be overridden +by a local sysadmin, create files matching +@DBUS_DATADIR@/dbus-1/session.d/*.conf instead. +--> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig></busconfig> diff --git a/bus/legacy-config/system.conf.in b/bus/legacy-config/system.conf.in new file mode 100644 index 00000000..84ed2967 --- /dev/null +++ b/bus/legacy-config/system.conf.in @@ -0,0 +1,20 @@ +<!-- +This configuration file is no longer required and may be removed. + +In older versions of dbus, this file defined the behaviour of the well-known +system bus. That behaviour is now determined by +@DBUS_DATADIR@/dbus-1/system.conf, which should not be edited. + +For local configuration changes, create a file +@DBUS_SYSCONFDIR@/dbus-1/system-local.conf or files matching +@DBUS_SYSCONFDIR@/dbus-1/system.d/*.conf, with a <busconfig> +element containing configuration directives. These directives can +override D-Bus or OS defaults. + +For upstream or distribution-wide defaults that can be overridden +by a local sysadmin, create files matching +@DBUS_DATADIR@/dbus-1/system.d/*.conf instead. +--> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig></busconfig> |