[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-70-gff6bb7a

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  756fac8d0433d02819d3910238ebf1b7a33a3046 (commit)

- Log -----------------------------------------------------------------
ff6bb7a... add a few configuration sanity checks for system mode
a4762ab... add disallow-exit to default configuration file
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/daemon.conf.in |    1 +
 src/daemon/main.c         |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------

commit a4762ab4b17715fdc7fd95aae7948507ea20ddf2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Aug 6 19:55:50 2008 +0200

    add disallow-exit to default configuration file

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 41c26e2..33b1d61 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -22,6 +22,7 @@
 ; daemonize = no
 ; fail = yes
 ; disallow-module-loading = no
+; disallow-exit = no
 ; use-pid-file = yes
 ; system-instance = no
 ; disable-shm = no

commit ff6bb7acdada86635cb09530d4ba3f4147b008da
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Aug 6 19:56:15 2008 +0200

    add a few configuration sanity checks for system mode

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 048af1e..00469c7 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -635,6 +635,22 @@ int main(int argc, char *argv[]) {
         goto finish;
     }
 
+    if (conf->system_instance && !conf->disallow_exit)
+        pa_log_warn(_("Running in system mode, but --disallow-exit not set!"));
+
+    if (conf->system_instance && !conf->disallow_module_loading)
+        pa_log_warn(_("Running in system mode, but --disallow-module-loading not set!"));
+
+    if (conf->system_instance && !conf->disable_shm) {
+        pa_log_notice(_("Running in system mode, forcibly disabling SHM mode!"));
+        conf->disable_shm = TRUE;
+    }
+
+    if (conf->system_instance && conf->exit_idle_time > 0) {
+        pa_log_notice(_("Running in system mode, forcibly disabling exit idle time!"));
+        conf->exit_idle_time = 0;
+    }
+
     if (conf->cmd == PA_CMD_START) {
         /* If we shall start PA only when it is not running yet, we
          * first take the autospawn lock to make things

-- 
hooks/post-receive
PulseAudio Sound Server