packages: iptables/ip6tables.init, iptables/iptables.init - (somewhat) unif...

[glen]

Author: glen                         Date: Thu Jan 27 22:26:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- (somewhat) unified order

---- Files affected:
packages/iptables:
   ip6tables.init (1.15 -> 1.16) , iptables.init (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/iptables/ip6tables.init
diff -u packages/iptables/ip6tables.init:1.15 packages/iptables/ip6tables.init:1.16
--- packages/iptables/ip6tables.init:1.15	Thu Dec 23 21:46:55 2010
+++ packages/iptables/ip6tables.init	Thu Jan 27 23:26:20 2011
@@ -111,7 +111,7 @@
 	start
 	;;
 
-  stop)
+  stop|clear)
 	stop
 	;;
 
@@ -122,14 +122,6 @@
 	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 @@
 	/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
 

================================================================
Index: packages/iptables/iptables.init
diff -u packages/iptables/iptables.init:1.12 packages/iptables/iptables.init:1.13
--- packages/iptables/iptables.init:1.12	Thu Jan 27 23:24:51 2011
+++ packages/iptables/iptables.init	Thu Jan 27 23:26:20 2011
@@ -122,14 +122,6 @@
 	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 && \
@@ -166,6 +158,14 @@
 	touch $IPTABLES_CONFIG
 	chmod 600 $IPTABLES_CONFIG
 	/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
 	;;
 
   *)
================================================================

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