X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mpd.init;h=6397003bb898b4b16a2ef7f87355331b83aea8e9;hb=256f16abf7d4209f022f7bc0a9743e9b4be4b9b9;hp=be9ab04b14bb70837fe33d32ea8a9fd609f0be05;hpb=263fd5187f2ddb60c5c10c607ac831def16a6e2a;p=packages%2Fmpd.git

diff --git a/mpd.init b/mpd.init
index be9ab04..6397003 100644
--- a/mpd.init
+++ b/mpd.init
@@ -13,35 +13,38 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/mpd ]; then
-		msg_starting "mpd"
-		OPTIONS=""
-		daemon mpd
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mpd
-	else
-		msg_already_running "mpd"
+	if [ -f /var/lock/subsys/mpd ]; then
+		msg_already_running "Music Player Daemon"
+		return
 	fi
+
+	msg_starting "Music Player Daemon"
+	OPTIONS=""
+	daemon /usr/bin/mpd
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mpd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/mpd ]; then
-		msg_stopping "mpd"
-		killproc mpd
-		rm -f /var/lock/subsys/mpd >/dev/null 2>&1
-	else
-		msg_not_running "mpd"
+	if [ ! -f /var/lock/subsys/mpd ]; then
+		msg_not_running "Music Player Daemon"
+		return
 	fi
+
+	msg_stopping "Music Player Daemon"
+	killproc mpd
+	rm -f /var/lock/subsys/mpd >/dev/null 2>&1
 }
 
 condrestart() {
 	if [ -f /var/lock/subsys/mpd ]; then
-		stop
-		start
-	else
 		msg_not_running mpd
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0