- (somewhat) unified order

Changed files:
    ip6tables.init -> 1.16
    iptables.init -> 1.13

diff --git a/ip6tables.init b/ip6tables.init
index cf0193fd0518505685910900c45569478be593d5..aac850f05749bab75638cc3d17b2691b3a7d7e5a 100644 (file)
--- a/ip6tables.init
+++ b/ip6tables.init
@@ -111,7 +111,7 @@ case "$1" in
        start
        ;;
 
-  stop)
+  stop|clear)
        stop
        ;;
 
@@ -122,14 +122,6 @@ case "$1" in
        start
        ;;
 
-  status)
-       tables=`cat /proc/net/ip6_tables_names 2>/dev/null`
-       for table in $tables; do
-               echo "Table: $table"
-               ip6tables -t $table -n --list
-       done
-       ;;
-
   panic)
        show "Changing target policies to DROP"
        iftable filter -P INPUT DROP && \
@@ -168,8 +160,16 @@ case "$1" in
        /usr/sbin/ip6tables-save -c > $IPTABLES_CONFIG  2>/dev/null && ok || fail
        ;;
 
+  status)
+       tables=`cat /proc/net/ip6_tables_names 2>/dev/null`
+       for table in $tables; do
+               echo "Table: $table"
+               ip6tables -t $table -n --list
+       done
+       ;;
+
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|panic|load|save|status}"
+       msg_usage "$0 {start|stop|restart|force-reload|panic|load|save|clear|status}"
        exit 3
 esac
 

diff --git a/iptables.init b/iptables.init
index 62f3b48a81ecac6be137324f0ec1f2395e54b6d2..304a3b7d81d5e55cd9fd2edae4d63a5150de6c27 100644 (file)
--- a/iptables.init
+++ b/iptables.init
@@ -122,14 +122,6 @@ case "$1" in
        start
        ;;
 
-  status)
-       tables=`cat /proc/net/ip_tables_names 2>/dev/null`
-       for table in $tables; do
-               echo "Table: $table"
-               iptables -t $table -n --list
-       done
-       ;;
-
   panic)
        show "Changing target policies to DROP"
        iftable filter -P INPUT DROP && \
@@ -168,6 +160,14 @@ case "$1" in
        /usr/sbin/iptables-save -c > $IPTABLES_CONFIG  2>/dev/null && ok || fail
        ;;
 
+  status)
+       tables=`cat /proc/net/ip_tables_names 2>/dev/null`
+       for table in $tables; do
+               echo "Table: $table"
+               iptables -t $table -n --list
+       done
+       ;;
+
   *)
        msg_usage "$0 {start|stop|restart|force-reload|panic|load|save|clear|status}"
        exit 3