[Astlinux-commits] SF.net SVN: astlinux: [1738] trunk/package/arno-fw

[<ppr...@us...>]

Revision: 1738
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1738&view=rev
Author:   pprindeville
Date:     2008-04-30 10:49:09 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
Set DHCP in firewall shim

Modified Paths:
--------------
    trunk/package/arno-fw/arnofw.mk
    trunk/package/arno-fw/arnofw.wrapper

Modified: trunk/package/arno-fw/arnofw.mk
===================================================================
--- trunk/package/arno-fw/arnofw.mk	2008-04-29 18:04:57 UTC (rev 1737)
+++ trunk/package/arno-fw/arnofw.mk	2008-04-30 17:49:09 UTC (rev 1738)
@@ -48,7 +48,7 @@
 	$(INSTALL) -D -m 0644 $(ARNOFW_DIR)$(ARNOFW_CONFIG) \
 		$(TARGET_DIR)/stat$(ARNOFW_CONFIG)
 	$(SED) 's:^IPTABLES="[^"]*":IPTABLES="$(IPTABLES_BIN)":' \
-		-e 's:^(INT_IF|EXT_IF|MODEM_IF|INTERNAL_NET|NAT|NAT_INTERNAL_NET)=:#&:' \
+		-e 's:^(INT_IF|EXT_IF|MODEM_IF|INTERNAL_NET|NAT|NAT_INTERNAL_NET|EXT_IF_DHCP_IP)=:#&:' \
 		$(TARGET_DIR)/stat$(ARNOFW_CONFIG)
 	$(SED) 's:^LOCAL_CONFIG_FILE="":LOCAL_CONFIG_FILE="$(ARNOFW_CONFIG_SHIM)":' \
 		$(TARGET_DIR)/stat$(ARNOFW_CONFIG)

Modified: trunk/package/arno-fw/arnofw.wrapper
===================================================================
--- trunk/package/arno-fw/arnofw.wrapper	2008-04-29 18:04:57 UTC (rev 1737)
+++ trunk/package/arno-fw/arnofw.wrapper	2008-04-30 17:49:09 UTC (rev 1738)
@@ -44,6 +44,12 @@
 
 NAT=1
 
+if [ -z "$EXTIP" -a -z "$PPPOEIF" ]; then
+  EXT_IF_DHCP_IP=1
+else
+  EXT_IF_DHCP_IP=0
+fi
+
 #
 # need to do some work on the NONAT variable as well
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.