SOURCES: NetworkManager.init - use functions - cleanup

[megabajt]

Author: megabajt                     Date: Wed Oct  3 20:09:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions
- cleanup

---- Files affected:
SOURCES:
   NetworkManager.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/NetworkManager.init
diff -u SOURCES/NetworkManager.init:1.3 SOURCES/NetworkManager.init:1.4
--- SOURCES/NetworkManager.init:1.3     Sat Sep  8 20:29:17 2007
+++ SOURCES/NetworkManager.init Wed Oct  3 22:09:43 2007
@@ -1,19 +1,15 @@
 #!/bin/sh
 #
-# NetworkManager:   NetworkManager daemon
+# NetworkManager       NetworkManager daemon
 #
-# chkconfig: 5 98 02
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection. \
+# chkconfig:           345 98 02
 #
-# processname: NetworkManager
-# pidfile: /var/run/NetworkManager.pid
+# description:         This is a daemon for automatically switching network \
+#                      connections to the best available connection.
+#
+# processname:         NetworkManager
+# pidfile:             /var/run/NetworkManager.pid
 #
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,50 +27,48 @@
        exit 0
 fi
 
-# so we can rearrange this easily
-processname=NetworkManager
-servicename=NetworkManager
-pidfile=/var/run/NetworkManager.pid
-
-RETVAL=0
-
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/NetworkManager ]; then
                msg_starting NetworkManager
-               sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-               daemon $processname
+               daemon NetworkManager --pid-file=/var/run/NetworkManager.pid
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
-               [ $RETVAL -eq 0 ] && echo `/sbin/pidof $processname` > $pidfile
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/NetworkManager
        else
                msg_already_running NetworkManager
        fi
-       ;;
-  stop)
-       # Stop daemons.
+}
+stop() {
        if [ -f /var/lock/subsys/NetworkManager ]; then
+               # Stop daemons.
                msg_stopping NetworkManager
-               killproc $servicename
-               rm -f /var/lock/subsys/$servicename >/dev/null 2>&1
-               rm -f $pidfile
+               killproc NetworkManager
+               rm -f /var/lock/subsys/NetworkManager
        else
                msg_not_running NetworkManager
        fi
+}
+
+RETVAL=0
+
+case "$1" in
+  start)
+       start
        ;;
-  status)
-       status $processname
-       RETVAL=$?
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
+       ;;
+  status)
+       status NetworkManager
+       RETVAL=$?
        ;;
   *)
-       msg_usage "$0  {start|stop|status|restart}"
+       msg_usage "$0 {start|stop|restart|status}"
        exit 3
 esac
-
+               
 exit $RETVAL
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager.init?r1=1.3&r2=1.4&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit