summaryrefslogtreecommitdiffstats
path: root/src/daemon/default.pa.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-27 21:04:25 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-27 21:04:25 +0000
commit5addad21a4ad3f9d9f38c5be7c45f628b8ab8045 (patch)
treea41f3888c975af4c5968963d248ad291e0166acc /src/daemon/default.pa.in
parentdcdf419449c956aa7c9f923b0922cbd4b9a74bf9 (diff)
make loading of a few more modules non-fatal
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2134 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/default.pa.in')
-rwxr-xr-xsrc/daemon/default.pa.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 56904f56..c1324a03 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -46,7 +46,9 @@ load-module module-detect
.endif
### Load several protocols
+.ifexists module-esound-protocol-unix@PA_SOEXT@
load-module module-esound-protocol-unix
+.endif
load-module module-native-protocol-unix
### Network access (may be configured with paprefs, so leave this commented
@@ -80,7 +82,9 @@ load-module module-suspend-on-idle
### Publish connection data in the X11 root window
.ifexists module-x11-publish@PA_SOEXT@
+.nofail
load-module module-x11-publish
+.fail
.endif
### Register ourselves in the X11 session manager
@@ -92,7 +96,9 @@ load-module module-x11-publish
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
.ifexists module-gconf@PA_SOEXT@
+.nofail
load-module module-gconf
+.fail
.endif
### Make some devices default