r2021 - in trunk

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2007-10-23 23:45:42 +0200 (Tue, 23 Oct 2007)
New Revision: 2021

Log:
Merging iptables from tag uclinux_20051014 into trunk, Patch contributed by Ewan Meadows

Copied: trunk/user/iptables (from rev 2020, tags/uclinux/uclinux_20051014/user/iptables)

Modified: trunk/user/iptables/Makefile
===================================================================
--- tags/uclinux/uclinux_20051014/user/iptables/Makefile	2007-10-22 21:59:38 UTC (rev 2020)
+++ trunk/user/iptables/Makefile	2007-10-23 21:45:42 UTC (rev 2021)
@@ -43,9 +43,9 @@
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
 
 # No longer experimental.
-ifneq ($(DO_MULTI), 1)
+#ifneq ($(DO_MULTI), 1)
 EXTRAS+=iptables-save iptables-restore
-endif
+#endif
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
 
 ifeq ($(DO_IPV6), 1)
@@ -113,14 +113,15 @@
 default: print-extensions all
 
 romfs:
-	$(ROMFSINST) /bin/iptables
+	$(ROMFSINST) iptables /usr/bin/iptables
 ifeq ($(DO_IPV6), 1)
 	$(ROMFSINST) /bin/ip6tables
 endif
-ifeq ($(DO_MULTI), 1)
-	$(ROMFSINST) -l $(ROMFSDIR)/bin/iptables /bin/iptables-save
-	$(ROMFSINST) -l $(ROMFSDIR)/bin/iptables /bin/iptables-restore
-endif
+#ifeq ($(DO_MULTI), 1)
+	$(ROMFSINST) iptables-save /usr/bin/iptables-save
+	$(ROMFSINST) iptables-restore /usr/bin/iptables-restore
+	$(ROMFSINST) iptables.conf.example /etc/iptables.conf.example
+#endif
 
 .PHONY: print-extensions
 print-extensions:

Added: trunk/user/iptables/iptables.conf.example

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-22 21:59:38 UTC (rev 2020)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-10-23 21:45:42 UTC (rev 2021)
@@ -236,7 +236,7 @@
 # CONFIG_USER_IPREDIR_IPREDIR is not set
 # CONFIG_USER_IPROUTE2 is not set
 # CONFIG_USER_IPSENTINEL_IPSENTINEL is not set
-# CONFIG_USER_IPTABLES_IPTABLES is not set
+CONFIG_USER_IPTABLES_IPTABLES=y
 # CONFIG_USER_IPTABLES_IP6TABLES is not set
 # CONFIG_USER_IPUTILS_IPUTILS is not set
 CONFIG_USER_IRSSI_IRSSI=y

Modified: trunk/vendors/Nintendo/common/rc.common
===================================================================
--- trunk/vendors/Nintendo/common/rc.common	2007-10-22 21:59:38 UTC (rev 2020)
+++ trunk/vendors/Nintendo/common/rc.common	2007-10-23 21:45:42 UTC (rev 2021)
@@ -42,7 +42,16 @@
 	echo "To configure wireless edit /etc/rc.conf or run 'wnc'."
 	__network_up="NO"
 fi
-
+#Start iptables before other services
+if [ "$start_iptables" = "YES" ]
+then
+	if [ "$__network_up" = "YES" ]
+	then
+		/etc/rc.d/iptables start
+	else
+		echo "Not starting iptables: network is down"
+	fi
+fi
 # start inetd if configured
 if [ "$start_inetd" = "YES" ]
 then

Added: trunk/vendors/Nintendo/common/rc.d/iptables