From 5839e6dc7dc4237174fb1d5cef9dc4ebfbe6e874 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <development@colin.guthr.ie> Date: Tue, 5 Aug 2008 20:41:31 +0100 Subject: [PATCH 501/503] Some customisations to esdcompat in order to adhere to our way of enabling/disabling pulseaudio --- src/daemon/esdcompat.in | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/daemon/esdcompat.in b/src/daemon/esdcompat.in index 6650180..eab4dad 100755 --- a/src/daemon/esdcompat.in +++ b/src/daemon/esdcompat.in @@ -24,7 +24,23 @@ fail() { exit 1 } -ARGS=" --log-target=syslog" +# Start Mandriva customisation +if [ -r ~/.pulserc ]; then + CONFIG=~/.pulserc +else + CONFIG=/etc/sysconfig/pulseaudio +fi + +PULSE_ARGS="--log-target=syslog" +[ -r "$CONFIG" ] && . $CONFIG + +if [ "$PULSE_SERVER_TYPE" != "personal" ]; then + echo "Not starting PulseAudio daemon due to sysconfig setting." >&2 + exit +fi + +ARGS=" $PULSE_ARGS" +# End Mandriva customisation while [ "$#" -gt "0" ]; do -- 1.6.1