packages: iptables/ip6tables.init, iptables/ip6tables.upstart (NEW) - upsta...

[glen]

Author: glen                         Date: Fri Aug 12 20:03:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstart for ip6tables

---- Files affected:
packages/iptables:
   ip6tables.init (1.16 -> 1.17) , ip6tables.upstart (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/iptables/ip6tables.init
diff -u packages/iptables/ip6tables.init:1.16 packages/iptables/ip6tables.init:1.17
--- packages/iptables/ip6tables.init:1.16	Thu Jan 27 23:26:20 2011
+++ packages/iptables/ip6tables.init	Fri Aug 12 22:03:25 2011
@@ -15,12 +15,11 @@
 # config: /etc/sysconfig/ip6tables
 
 IPTABLES_CONFIG=/etc/sysconfig/ip6tables
-
 if [ ! -f $IPTABLES_CONFIG ]; then
-   	case "$1" in
+	case "$1" in
 	start|restart|force-reload)
 		exit 0
-		;;
+	;;
 	esac
 fi
 
@@ -105,6 +104,8 @@
 	ok || fail
 	rm -f /var/lock/subsys/ip6tables
 }
+
+upstart_controlled --except status panic load save clear
 
 case "$1" in
   start|load)

================================================================
Index: packages/iptables/ip6tables.upstart
diff -u /dev/null packages/iptables/ip6tables.upstart:1.1
--- /dev/null	Fri Aug 12 22:03:30 2011
+++ packages/iptables/ip6tables.upstart	Fri Aug 12 22:03:25 2011
@@ -0,0 +1,19 @@
+description "Load /etc/sysconfig/iptables pre-defined rules"
+
+start on pld.network-started
+stop on pld.network-stopped
+
+env IPTABLES_CONFIG=/etc/sysconfig/ip6tables
+
+pre-start script
+	# fail early if config missing
+	test -f $IPTABLES_CONFIG || /sbin/initctl stop
+end script
+
+script
+	exec /etc/rc.d/init.d/iptables6 load
+end script
+
+pre-stop script
+	exec /etc/rc.d/init.d/iptables6 clear
+end script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/ip6tables.init?r1=1.16&r2=1.17&f=u