summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-06 19:56:15 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-06 19:56:15 +0200
commitff6bb7acdada86635cb09530d4ba3f4147b008da (patch)
treeda66cb4c10ed8b8039cbe0cfa6883c0dc0ca949e
parenta4762ab4b17715fdc7fd95aae7948507ea20ddf2 (diff)
add a few configuration sanity checks for system mode
-rw-r--r--src/daemon/main.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 048af1e6..00469c7a 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