On 2015-12-07 22:22, Tanu Kaskinen wrote: > I want to enable client.conf.d, because in OpenEmbedded-core we have > a graphical environment called Sato that runs as root. Sato needs to > set allow-autospawn-for-root=true in client.conf, but the default > configuration in OpenEmbedded-core should not set that option. With > this patch, I can create a Sato-specific package that simply installs > 50-sato.conf in /etc/pulse/client.conf.d without conflicting with the > main client.conf coming from a different package. > > daemon.conf.d is enabled just because it would be strange to not > support it while client.conf.d is supported. > --- > man/pulse-client.conf.5.xml.in | 19 +++++++++++++++---- > man/pulse-daemon.conf.5.xml.in | 25 ++++++++++++++++++------- > src/daemon/daemon-conf.c | 2 +- > src/pulse/client-conf.c | 2 +- > 4 files changed, 35 insertions(+), 13 deletions(-) > > diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in > index 1002dbe..cca2219 100644 > --- a/man/pulse-client.conf.5.xml.in > +++ b/man/pulse-client.conf.5.xml.in > @@ -23,15 +23,26 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. > > <synopsis> > <p><file>~/.config/pulse/client.conf</file></p> > - > + <p><file>~/.config/pulse/client.conf.d/*.conf</file></p> > <p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p> > + <p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf.d/*.conf</file></p> Sorry for not noticing this earlier, but to compare with PAM, which has /etc/security/limits.d/*.conf, not /etc/security/limits.conf.d/*.conf Hence our directory name should be ~/.config/pulse/client.d rather than ~/.config/pulse/client.conf.d OTOH, /usr/share/alsa/alsa.conf includes files from /usr/share/alsa/alsa.conf.d, not /usr/share/alsa/alsa.d/ Is there a more common standard? (E g, what does systemd do?) -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
