summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2011-10-20 14:11:53 +0100
committerColin Guthrie <colin@mageia.org>2011-10-20 14:12:05 +0100
commit2fde64c7866098747b5517290f8bc87b143b6c69 (patch)
tree3ceeb478eb42d1af529eb879d8c24305dd4442bc
parent22e63b9edf33957d9b5b5adcdea2a39d84a9c2bb (diff)
conf: Use .nofail when loading module-jackdbus-detect
When starting via a console login, PA will likely not have a session DBus to play with. As there is no X11 environment, libdbus will be unable to launch a session DBus for us and thus the module will fail to load which in turn prevents PA from loading. If the user subsequently logs into X11 this it will still not be possible to load the module as the server will be ignorant of the X11 and DBus environment variables so a longer term solution for handling this should be found.
-rwxr-xr-xsrc/daemon/default.pa.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 57f259c5..c6ec29cd 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -81,7 +81,9 @@ load-module module-detect
### Automatically connect sink and source if JACK server is present
.ifexists module-jackdbus-detect@PA_SOEXT@
+.nofail
load-module module-jackdbus-detect
+.fail
.endif
ifelse(@HAVE_BLUEZ@, 1, [dnl