Bug#459517: Acknowledgement (MPD_DEBUG not settable in /etc/defaults/mpd)

[Adam Majer]

Also, the MPD_OPTS is not passed to mpd but to the start-stop-daemon.
You have to use -- to delimit command line options passed to the daemon
and not the start-stop-daemon. So, I've made a few small changes and
I've attached the modified init.d script for mpd.

Cheers,
Adam

#!/bin/sh -e

umask 0022

PATH=/sbin:/bin:/usr/sbin:/usr/bin
NAME=mpd
DESC="Music Player Daemon"
DAEMON=/usr/bin/mpd
MPDCONF=/etc/mpd.conf
START_MPD=true

# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0

# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME

PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' 
$MPDCONF)
DBFILE=$(sed -n 's/^[[:space:]]*db_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' 
$MPDCONF)

if [ -n "$MPD_DEBUG" ]; then
    MPD_OPTS=--verbose $MPD_OPTS
fi

mpd_start () {
    if [ "$START_MPD" != "true" ]; then
        echo "Not starting MPD: disabled by /etc/default/mpd."
        exit 0
    fi
    echo -n "Starting $DESC: "

    if ! (grep -q db_file $MPDCONF && grep -q pid_file $MPDCONF); then
        echo "$MPDCONF must have db_file and pid_file set; not starting."
        exit 0
    fi

    PIDDIR=$(dirname "$PIDFILE")
    if [ ! -d "$PIDDIR" ]; then
        mkdir -m 0755 $PIDDIR
        chown mpd:audio $PIDDIR
    fi

    if [ "$FORCE_CREATE_DB" -o ! -f "$DBFILE" ]; then
        echo -n "creating $DBFILE... "
        $DAEMON --create-db "$MPDCONF" > /dev/null 2>&1
    fi

    if start-stop-daemon --start --quiet --pidfile $PIDFILE \
            --exec $DAEMON -- $MPD_OPTS "$MPDCONF"; then
        echo "$NAME."
    else
        echo "failed."
    fi
}

mpd_stop () {
    echo -n "Stopping $DESC: "
    if start-stop-daemon --stop --quiet --retry 5 --pidfile $PIDFILE \
            --exec $DAEMON; then
        echo "$NAME."
    else
        echo "not running or no pid_file set."
    fi
}

# note to self: don't call the non-standard args for this in
# {post,pre}{inst,rm} scripts since users are not forced to upgrade
# /etc/init.d/mpd when mpd is updated
case "$1" in
    start)
        mpd_start
        ;;
    stop)
        mpd_stop
        ;;
    restart|reload)
        mpd_stop
        mpd_start
        ;;
    force-start|start-create-db)
        FORCE_CREATE_DB=1
        mpd_start
        ;;
    force-restart|force-reload)
        FORCE_CREATE_DB=1
        mpd_stop
        mpd_start
        ;;
    *)
        echo "Usage: $0 {start|start-create-db|stop|restart|reload}"
        exit 1
        ;;
esac