2 files changed, 37 insertions, 32 deletions
diff --git a/media-sound/mpd/files/mpd.init b/media-sound/mpd/files/mpd.init
deleted file mode 100644
index 2a75f7d..0000000
--- a/media-sound/mpd/files/mpd.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.init,v 1.1 2010/09/10 07:55:07 angelos Exp $
-
-depend() {
-	need localmount
-	use net netmount nfsmount alsa esound pulseaudio
-} 
-
-checkconfig() {
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --quiet --background --exec /usr/bin/mpd --pidfile /var/run/mpd.pid --make-pidfile -- --no-daemon /etc/mpd.conf 2>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --exec /usr/bin/mpd --pidfile /var/run/mpd.pid
-	eend $? 
-}
diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init
new file mode 100644
index 0000000..d8b9de8
--- /dev/null
+++ b/media-sound/mpd/files/mpd2.init
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need localmount
+	use net netmount nfsmount alsasound esound pulseaudio
+}
+
+checkconfig() {
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	if ! grep -q ^pid_file /etc/mpd.conf; then
+		eerror "Invalid configuration: pid_file needs to be set."
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon"
+	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	/usr/bin/mpd --kill
+	eend $?
+}