[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.1-1-36-gff61ccb

[Florian Schlichting]

The following commit has been merged in the master branch:
commit bae4dd44479326ced05b3deadcb610ff57b2afe4
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Sun Feb 24 20:35:59 2013 +0100

    allow stopping mpd even when START_MPD=false (closes: #545559)

diff --git a/debian/README.Debian b/debian/README.Debian
index f6ed532..8cd433a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,11 +5,11 @@ After installation, you will need to populate the MPD database. It is
 recommended that you do this through a client such as mpc, or by running
 "invoke-rc.d mpd force-restart".
 
-To prevent mpd from running as a system service, comment out
-``START_MPD=true'' in /etc/default/mpd. A normal user account may then
-run mpd using their own ~/.mpdconf.
+To prevent mpd from running as a system service, edit /etc/default/mpd and
+set "START_MPD=false". A normal user account may then run mpd from their
+session using their own ~/.mpdconf and adjusted paths.
 
-In the default /etc/mpd.conf, bind_to_address is set to 127.0.0.1 in
+In the default /etc/mpd.conf, bind_to_address is set to "localhost" in
 order to prevent other (possibly untrusted) hosts from accessing MPD.
 If you wish to allow other hosts to access MPD, you must change this
 value to an appropriate interface, or comment it out to enable listening
@@ -19,5 +19,3 @@ When using ALSA with dmix, you may run into problems sharing the sound card
 between the "mpd" user and your own account. A workaround is to use ALSA's
 "ipc_key_add_uid" and "ipc_perm" directives. See the ALSA documentation for
 instructions on how to add this to your configuration.
-
-  -- Decklin Foster <decklin at red-bean.com>  Thu, 28 Sep 2006 22:49:49 -0400
diff --git a/debian/mpd.init.d b/debian/mpd.init.d
index f94d6c8..be2bb37 100644
--- a/debian/mpd.init.d
+++ b/debian/mpd.init.d
@@ -74,10 +74,6 @@ mpd_start () {
 }
 
 mpd_stop () {
-    if [ "$START_MPD" != "true" ]; then
-        log_failure_msg "Not stopping MPD: disabled by /etc/default/$NAME".
-        exit 0
-    fi
     if [ -z "$PIDFILE" ]; then
         log_failure_msg \
             "$MPDCONF must have pid_file set; cannot stop daemon."

-- 
Git repository for pkg-mpd