daemon-conf: Don't make log files executable.

[pulseaudio] / src / daemon / system.pa.in

diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 27e428156abd8a52584ca25c8db21105cff72674..0cd10b83d70d93217186c984bedc32c683fabc6f 100755 (executable)
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -18,13 +18,21 @@
 
 # This startup script is used only if PulseAudio is started in system
 # mode.
+changequote(`[', `]')dnl Set up m4 quoting
 
 ### Automatically load driver modules depending on the hardware available
+ifelse(@HAVE_UDEV@, 1, [dnl
+.ifexists module-udev-detect@PA_SOEXT@
+load-module module-udev-detect
+.else
+], @HAVE_HAL@, 1, [dnl
 .ifexists module-hal-detect@PA_SOEXT@
 load-module module-hal-detect
 .else
-### Alternatively use the static hardware detection module (for systems that
-### lack HAL support)
+], [dnl
+.ifexists module-detect@PA_SOEXT@
+])dnl
+### Use the static hardware detection module (for systems that lack udev/hal support)
 load-module module-detect
 .endif
 
@@ -32,6 +40,10 @@ load-module module-detect
 .ifexists module-esound-protocol-unix@PA_SOEXT@
 load-module module-esound-protocol-unix
 .endif
+.ifexists module-dbus-protocol@PA_SOEXT@
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
 load-module module-native-protocol-unix
 
 ### Automatically restore the volume of streams and devices