- fixed previous change

[packages/arpwatch.git] / arpwatch.init

diff --git a/arpwatch.init b/arpwatch.init
index 7a7bb716e20d9f9fb9f10571af962352a02e4d67..7eb7196d1ffe4abc0f10a46411771a5f429764ae 100644 (file)
--- a/arpwatch.init
+++ b/arpwatch.init
@@ -3,8 +3,7 @@
 # chkconfig: 345 55 45
 # description: The arpwatch daemon attempts to keep track of ethernet/ip \
 #              address pairings.
-# processname: arpwatch
-
+# processname: arpwatch
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -16,12 +15,16 @@
 [ -f /etc/sysconfig/arpwatch ] && . /etc/sysconfig/arpwatch
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       msg_Network_Down "arpwatch"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "arpwatch"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -32,38 +35,40 @@ case "$1" in
                          | egrep '^[^ ].*' |egrep -v "NOARP|LOOPBACK" \
                          |sed 's/[0-9]*: \([a-zA-Z0-9]*\)[@:].*/\1/'|xargs`"
                fi
+               [ ! -z "$NETWORKS" ] && NETWORKS="-n $NETWORKS"
                for IFC in $INTERFACES; do
-                       msg_stopping "arpwatch"
-                       touch /var/state/arpwatch/$IFC.dat
-                       daemon arpwatch -i $IFC -f /var/state/arpwatch/$IFC.dat
+                       msg_starting "arpwatch ($IFC)"
+                       touch /var/lib/arpwatch/$IFC.dat
+                       chown 2:2 /var/lib/arpwatch/$IFC.dat
+                       daemon arpwatch $NETWORKS -i $IFC -f /var/lib/arpwatch/$IFC.dat -u daemon
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/arpwatch
                done
        else
-               msg_Already_Running "arpwatch"
+               msg_already_running "arpwatch"
        fi
        ;;
   stop)
-       rm -f /var/lock/subsys/arpwatch
        if [ -f /var/lock/subsys/arpwatch ]; then
                msg_stopping "arpwatch"
                killproc arpwatch
                rm -f /var/lock/subsys/arpwatch >/dev/null 2>&1
        else
-               msg_Not_Running "arpwatch"
-               exit 1
+               msg_not_running "arpwatch"
        fi      
        ;;
   status)
        status arpwatch
+       exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_Usage "$0 {start|stop|status|restart|reload}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL