diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2015-12-07 23:22:42 +0200 |
|---|---|---|
| committer | David Henningsson <david.henningsson@canonical.com> | 2015-12-14 13:47:04 +0100 |
| commit | 7b9fcc01f62558a6f517e2a23408e98c2688bd9e (patch) | |
| tree | 655cacc6a235f656abd9f62a633759e14490fc21 /src/pulse/client-conf.c | |
| parent | 1d7ce901398b4e65bfac991aa7a351ac15c4910e (diff) | |
| download | pulseaudio-7b9fcc01f62558a6f517e2a23408e98c2688bd9e.tar.gz | |
client-conf, daemon-conf: enable .d directories
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.
Diffstat (limited to 'src/pulse/client-conf.c')
| -rw-r--r-- | src/pulse/client-conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index c2ece90e7..c23aa6bf6 100644 --- a/src/pulse/client-conf.c +++ b/src/pulse/client-conf.c @@ -149,7 +149,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn); if (f) { - pa_config_parse(fn, f, table, NULL, false, NULL); + pa_config_parse(fn, f, table, NULL, true, NULL); pa_xfree(fn); fclose(f); } |