Author: glen                         Date: Sun Apr  3 11:06:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify

---- Files affected:
packages/mpd:
   mpd.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/mpd/mpd.init
diff -u packages/mpd/mpd.init:1.2 packages/mpd/mpd.init:1.3
--- packages/mpd/mpd.init:1.2   Wed Nov  5 18:17:14 2008
+++ packages/mpd/mpd.init       Sun Apr  3 13:06:31 2011
@@ -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
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpd/mpd.init?r1=1.2&r2=1.3&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to