summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-11-13 19:39:23 +0000
committerLennart Poettering <lennart@poettering.net>2007-11-13 19:39:23 +0000
commit15f56de8f2a10e092e11dfa3fc48ee28d2dd7e25 (patch)
tree3757905e5fc5468fc1e45da51b8fccc23d8289b7
parent7b321eda3af7dbdd689152da9b3ca315d383b5b4 (diff)
don't touch RLIMIT:MEMBLOCK by default. This should improve out-of-the-box comaptibility with JACK
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2052 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/daemon/daemon-conf.c2
-rw-r--r--src/daemon/daemon.conf.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 089b12fc..3d63891c 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -90,7 +90,7 @@ static const pa_daemon_conf default_conf = {
, .rlimit_nproc = { .value = 0, .is_set = FALSE }
#endif
#ifdef RLIMIT_MEMLOCK
- , .rlimit_memlock = { .value = 16384, .is_set = TRUE }
+ , .rlimit_memlock = { .value = 0, .is_set = FALSE }
#endif
#ifdef RLIMIT_NICE
, .rlimit_nice = { .value = 31, .is_set = TRUE } /* nice level of -11 */
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index f15d93e8..8d224e82 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -56,7 +56,7 @@
; rlimit-nofile = 256
; rlimit-stack = -1
; rlimit-nproc = -1
-; rlimit-memlock = 16384
+; rlimit-memlock = -1
; rlimit-nice = 31
; rlimit-rtprio = 9