From: Luca Boccassi <bluca@debian.org>
Date: Fri, 13 Sep 2024 17:41:32 +0000 (+0200)
Subject: spec: recommend searching for system-services in /etc/ and /run/
X-Git-Tag: dbus-1.15.12~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a0890023cfb9114220aed3e8f324e54b5f8255;p=thirdparty%2Fdbus.git

spec: recommend searching for system-services in /etc/ and /run/

This is useful when an asset manager wants to install a system
service while /usr/ is read-only (e.g.: portable services running
on a different namespaced image). Also recommend searching in /run/
following the now-standard pattern, for ephemeral services.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index f278c1e48..0aeb60b4c 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -5373,8 +5373,10 @@
         If two .service files in different directories offer the same
         service name, the one in the higher-priority directory is used:
         for instance, on the system bus, .service files in
-        /usr/local/share/dbus-1/system-services take precedence over those
-        in /usr/share/dbus-1/system-services.
+        /etc/dbus-1/system-services takes precedence over those in
+        /run/dbus-1/system-services, which in turn take precedence over
+        those in /usr/local/share/dbus-1/system-services, which in turn take
+        precedence over those in /usr/share/dbus-1/system-services.
       </para>
       <para>
         The executable launched will have the environment variable
@@ -5829,12 +5831,19 @@
         <para>
           On Unix systems, the system bus should default to searching
           for .service files in
+          <literal>/etc/dbus-1/system-services</literal>,
+          <literal>/run/dbus-1/system-services</literal>,
           <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.
+          The directory in <literal>/etc/</literal> is reserved for use by
+          either the local system administrator,
+          or an asset manager deploying services that are not part of the OS.
+          The directory in <literal>/run/</literal> is reserved for ephemeral
+          services that will disappear after a reboot.
           <footnote>
             <para>
               The system bus is security-sensitive and is typically executed