- use functions

- cleanup

Changed files:
    NetworkManager.init -> 1.4

diff --git a/NetworkManager.init b/NetworkManager.init
index f196ca5330baa7d8b43d84254a378848d92cb2de..68568a665e762c6646a42d9369b3444c16dbf436 100644 (file)
--- a/NetworkManager.init
+++ b/NetworkManager.init
@@ -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 @@ else
        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