rpms/arpwatch/devel arpwatch.init,1.1,1.2 arpwatch.spec,1.2,1.3

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/arpwatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31838

Modified Files:
	arpwatch.init arpwatch.spec 
Log Message:
- fix return codes in init script (#237781)



Index: arpwatch.init
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/arpwatch.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arpwatch.init	28 Nov 2006 13:12:39 -0000	1.1
+++ arpwatch.init	24 May 2007 14:14:48 -0000	1.2
@@ -15,16 +15,13 @@
 	. /etc/sysconfig/arpwatch
 fi
 
-# Check that networking is up.
-if [ "$NETWORKING" = "no" ]
-then
-	exit 0
-fi
-
 RETVAL=0
 prog="arpwatch"
 
 start () {
+	# Check that networking is up.
+	[ "$NETWORKING" = "no" ] && exit 1
+
 	echo -n $"Starting $prog: "
 	daemon arpwatch $OPTIONS
 	RETVAL=$?
@@ -55,6 +52,7 @@
 	;;
   status)
 	status arpwatch
+	RETVAL=$?
 	;;
   restart|reload)
 	restart
@@ -64,7 +62,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
+	RETVAL=3
 esac
 
-exit $?
+exit $RETVAL


Index: arpwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpwatch/devel/arpwatch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arpwatch.spec	15 Jan 2007 17:43:21 -0000	1.2
+++ arpwatch.spec	24 May 2007 14:14:48 -0000	1.3
@@ -3,7 +3,7 @@
 Name: arpwatch
 Epoch: 14
 Version: 2.1a15
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Network monitoring tools for tracking IP addresses on a network
 Group: Applications/System
 License: BSD
@@ -137,6 +137,9 @@
 %verify(not md5 size mtime) %config %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Thu May 24 2007 Miroslav Lichvar <mlichvar at redhat.com> 14:2.1a15-4
+- fix return codes in init script (#237781)
+
 * Mon Jan 15 2007 Miroslav Lichvar <mlichvar at redhat.com> 14:2.1a15-3
 - rename pcap user to arpwatch