services-dbus.patch

   1 diff --git a/source/services/dbus.service.linux b/source/services/dbus.service.linux
   2 index 7e4fc6b..48ea1aa 100644
   3 --- a/source/services/dbus.service.linux
   4 +++ b/source/services/dbus.service.linux
   5 @@ -9,7 +9,7 @@ After=machine-id.service extra-shared-libraries.target
   6  [Service]
   7  RuntimeDirectory=%p
   8  RuntimeDirectoryMode=0755
   9 -ExecStartPre=setfacl -m 'u:messagebus:rw' "%t/service-manager/control"
  10 +ExecStartPre=setfacl -m 'u:dbus:rw' "%t/service-manager/control"
  11  ExecStartPre=install -d -m 0755 -- /var/db/%p
  12  ExecStartPre=sh -c 'test -r /var/db/%p/machine-id || ln -s /etc/machine-id /var/db/%p/'
  13  # The --address=systemd: option is the closest to our UCSPI-LOCAL.
  14 diff --git a/source/services/system-wide.conf.linux b/source/services/system-wide.conf.linux
  15 index 3f7e475..63d53f7 100644
  16 --- a/source/services/system-wide.conf.linux
  17 +++ b/source/services/system-wide.conf.linux
  18 @@ -1,6 +1,6 @@
  19  <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  20  <busconfig>
  21 -  <include>/etc/dbus-1/system.conf</include>
  22 +  <include>/usr/share/dbus-1/system.conf</include>
  23    <!-- This is a helper that is used to launch system-wide services -->
  24 -  <servicehelper>/usr/local/bin/dbus-daemon-launch-helper</servicehelper>
  25 +  <servicehelper>/usr/bin/dbus-daemon-launch-helper</servicehelper>
  26  </busconfig>