diff options
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 14594416..5fc9f01c 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -496,7 +496,7 @@ int main(int argc, char *argv[]) { if (conf->high_priority && (conf->cmd == PA_CMD_DAEMON || conf->cmd == PA_CMD_START)) pa_raise_priority(conf->nice_level); - if (pa_have_caps()) { + if (!real_root && pa_have_caps()) { pa_bool_t drop; drop = (conf->cmd != PA_CMD_DAEMON && conf->cmd != PA_CMD_START) || !conf->realtime_scheduling; @@ -627,6 +627,11 @@ int main(int argc, char *argv[]) { goto finish; } + if (conf->cmd == PA_CMD_START && conf->system_instance) { + pa_log("--start not supported for system instances."); + goto finish; + } + 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 @@ -762,8 +767,6 @@ int main(int argc, char *argv[]) { /* If we are already running and with are run in * --start mode, then let's return this as success. */ - pa_log_info("z=%i rock!", z); - retval = 0; goto finish; } |