unify init script

diff --git a/noip.init b/noip.init
index df0aef2b15b9f65dfa9001093e19a0ab477c1c40..6dc4c6792c219d230b6b779832dea60d69eb2584 100755 (executable)
--- a/noip.init
+++ b/noip.init
@@ -23,28 +23,31 @@ if [ -f /etc/sysconfig/noip ]; then
 fi
 
 start() {
+       if [ -f /var/lock/subsys/noip ]; then
+               msg_already_runing noip
+               return
+       fi
+
        if [ ! -s /etc/noip.conf ]; then
                echo "You should first run $0 config to prepare configuration";
                exit 3
        fi
-       if [ ! -f /var/lock/subsys/noip ]; then
-               msg_starting noip
-               daemon noip $OPTIONS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/noip
-       else
-               msg_already_runing noip
-       fi
+
+       msg_starting noip
+       daemon /usr/sbin/noip $OPTIONS
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/noip
 }
 
 stop() {
-       if [ -f /var/lock/subsys/noip ]; then
-               msg_stopping noip
-               killproc noip
-               rm -f /var/lock/subsys/noip > /dev/null 2>&1
-       else
+       if [ ! -f /var/lock/subsys/noip ]; then
                msg_not_running noip
+               return
        fi
+
+       msg_stopping noip
+       killproc noip
+       rm -f /var/lock/subsys/noip > /dev/null 2>&1
 }
 
 RETVAL=0