summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-10 10:10:36 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-10 10:10:38 +0000
commit21c8094040bba43b5cc5aae016b57eb3b0cac450 (patch)
treed5ba49e1002743306f392b1f1794e9470f0bca00 /doc
parent349260f245d95a6c8bcc0f000be1f3232c616052 (diff)
parentfccb5a0fe11a2293ba5bfc09e0f3fe296d724eb2 (diff)
downloaddbus-21c8094040bba43b5cc5aae016b57eb3b0cac450.tar.gz
Merge branch 'system-search-paths-21620'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21620 Reviewed-by: Lennart Poettering <lennart@poettering.net>
Diffstat (limited to 'doc')
-rw-r--r--doc/dbus-specification.xml27
1 files changed, 26 insertions, 1 deletions
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 959c4e7f..0717f7f2 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -4636,7 +4636,32 @@
</footnote>
</para>
<para>
- [FIXME specify location of system bus .service files]
+ On Unix systems, the system bus should default to searching
+ for .service files in
+ <literal>/usr/local/share/dbus-1/system-services</literal>,
+ <literal>/usr/share/dbus-1/system-services</literal> and
+ <literal>/lib/dbus-1/system-services</literal>, with that order
+ of precedence. It may also search other implementation-specific
+ locations, but should not vary these locations based on environment
+ variables.
+ <footnote>
+ <para>
+ The system bus is security-sensitive and is typically executed
+ by an init system with a clean environment. Its launch helper
+ process is particularly security-sensitive, and specifically
+ clears its own environment.
+ </para>
+ </footnote>
+ </para>
+ <para>
+ Software packages should install their system .service
+ files to their configured
+ <literal>${datadir}/dbus-1/system-services</literal>,
+ where <literal>${datadir}</literal> is as defined by the GNU
+ coding standards. System administrators can arrange
+ for these service files to be read by editing the system bus'
+ configuration file or by symlinking them into the default
+ locations.
</para>
</sect3>
</sect2>