rpms/iptables/F-7 iptables.init,1.13,1.14 iptables.spec,1.48,1.49

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13275

Modified Files:
	iptables.init iptables.spec 
Log Message:
- dropped lsb header from init script, delayes start after network
- fixed return values in init script




Index: iptables.init
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iptables.init	28 Aug 2007 15:15:49 -0000	1.13
+++ iptables.init	19 Sep 2007 10:38:26 -0000	1.14
@@ -8,15 +8,6 @@
 # config: /etc/sysconfig/iptables
 # config: /etc/sysconfig/iptables-config
 #
-### BEGIN INIT INFO
-# Provides: iptables
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop iptables firewall
-# Description: Start, stop and save iptables firewall
-### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
@@ -316,7 +307,7 @@
 	RETVAL=$?
 	;;
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 7
+	[ $running -eq 0 ] || exit 0
 	restart
 	RETVAL=$?
 	;;
@@ -335,7 +326,7 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|restart|condrestart|status|panic|save}"
-	RETVAL=3
+	RETVAL=2
 	;;
 esac
 


Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/F-7/iptables.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- iptables.spec	28 Aug 2007 15:15:49 -0000	1.48
+++ iptables.spec	19 Sep 2007 10:38:26 -0000	1.49
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.3.8
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -147,6 +147,10 @@
 %endif
 
 %changelog
+* Wed Sep 19 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2.1
+- dropped lsb header from init script, delayes start after network
+- fixed return values in init script
+
 * Thu Aug 23 2007 Thomas Woerner <twoerner at redhat.com> 1.3.8-2
 - fixed initscript for LSB conformance (rhbz#246953, rhbz#242459)
 - provide iptc interface again, but unsupported (rhbz#216733)