Attachment 113751 Details for Bug 89280 – [2/2] Do not fail dbus startup is system.d/session.d files are missing

[patch] [2/2] Do not fail dbus startup is system.d/session.d files are missing

0002-Do-not-fail-dbus-startup-is-system.d-session.d-files.patch (text/plain), 2.78 KB, created by xnox on 2015-02-23 10:23:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: xnox

Created: 2015-02-23 10:23:28 UTC

Size: 2.78 KB

patch

obsolete

>From d31d5cd0a012488ef3e3832d6992a79b524a7baa Mon Sep 17 00:00:00 2001
>From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
>Date: Tue, 10 Feb 2015 00:28:13 +0000
>Subject: [PATCH 2/2] Do not fail dbus startup is system.d/session.d files are
> missing.
>Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ
>
>Also explicitely source /etc/dbus-1/system.d, session.d directories,
>this thus enables one to set sysconfdir to /usr/share, and thus store
>all/most distro provided bus configurations in
>/usr/share/dbus-1/system.d|session.d, have empty /etc/dbus-1, yet
>allow users to override configuration there.
>
>This is similar in spirit to XDG Base Directory Specification,
>fontconfig/udev/systemd overlay configuration. Possibly upstream
>should consider switching to ship system.conf/session.conf in _datadir
>by default, instead _sysconfdir. This patch ensures that backwards
>compatible configuration paths continue to be operational, if such a
>switch is done.
>
>This is tested and works really well for my use-case.
>
>Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
>---
> bus/session.conf.in | 6 ++++--
> bus/system.conf.in  | 6 ++++--
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/bus/session.conf.in b/bus/session.conf.in
>index cfe9544..5c84ac9 100644
>--- a/bus/session.conf.in
>+++ b/bus/session.conf.in
>@@ -27,11 +27,13 @@
> 
>   
>-  <includedir>session.d</includedir>
>+  <includedir ignore_missing="yes">session.d</includedir>
>+
>+  <includedir ignore_missing="yes">/etc/dbus-1/session.d</includedir>
> 
>   
>-  <include ignore_missing="yes">session-local.conf</include>
>+  <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include>
> 
>   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
> 
>diff --git a/bus/system.conf.in b/bus/system.conf.in
>index ac78c73..ff8d96f 100644
>--- a/bus/system.conf.in
>+++ b/bus/system.conf.in
>@@ -99,11 +99,13 @@
> 
>   
>-  <includedir>system.d</includedir>
>+  <includedir ignore_missing="yes">system.d</includedir>
>+
>+  <includedir ignore_missing="yes">/etc/dbus-1/system.d</includedir>
> 
>   
>-  <include ignore_missing="yes">system-local.conf</include>
>+  <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>
> 
>   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
> 
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 89280: 113750 | 113751 | 113819 | 113820 | 113821 | 113917 | 113918 | 116061 | 116073 | 116074

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.