- upstart for ip6tables

Changed files:
    ip6tables.init -> 1.17
    ip6tables.upstart -> 1.1

diff --git a/ip6tables.init b/ip6tables.init
index aac850f05749bab75638cc3d17b2691b3a7d7e5a..8d66d65bbc2232290c5fda22e847056706c52ca5 100644 (file)
--- a/ip6tables.init
+++ b/ip6tables.init
@@ -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
 
@@ -106,6 +105,8 @@ stop() {
        rm -f /var/lock/subsys/ip6tables
 }
 
+upstart_controlled --except status panic load save clear
+
 case "$1" in
   start|load)
        start

diff --git a/ip6tables.upstart b/ip6tables.upstart
new file mode 100644 (file)
index 0000000..6b885e9
--- /dev/null
+++ b/ip6tables.upstart
@@ -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