summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-11-01 23:29:06 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-02 00:12:19 +0100
commit33f9778bc83086837b99e5c5e99cd514cb0d154e (patch)
tree90c301ce159db7d07ac9212ec220d3200e48103b /gnu
parentd12eaa68830573b8a816e333b1afa22b15612a54 (diff)
downloadguix-33f9778bc83086837b99e5c5e99cd514cb0d154e.tar.gz
services: dbus: Include each service's "share/dbus-1/system.d".
Fixes <https://bugs.gnu.org/37911>.
Reported by Jack Hill <jackhill@jackhill.us>.

Sometime between 1.1.8 and 1.4.3, 'colord' moved had its
'org.freedesktop.ColorManager.conf' file moved from
"etc/dbus-1/system.d" to "share/dbus-1/system.d".  Adjust to this
change.

* gnu/services/dbus.scm (dbus-configuration-directory): Add an
'includedir' directive for DIR/share/dbus-1/system.d.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/dbus.scm2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 35d7ff3c9c..fcdeb3bf60 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -100,6 +100,8 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in
             ,@(append-map (lambda (dir)
                             `((includedir
                                ,(string-append dir "/etc/dbus-1/system.d"))
+                              (includedir
+                               ,(string-append dir "/share/dbus-1/system.d"))
                               (servicedir       ;for '.service' files
                                ,(string-append dir "/share/dbus-1/services"))))
                           services)))