*** empty log message ***

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@754 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 29 insertions, 36 deletions

diff --git a/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot
index 47a255dd0f..0722dc0b76 100755
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/target/default/target_skeleton/etc/init.d/S10boot
@@ -40,5 +40,3 @@ vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 [ -z "$FAILSAFE" ] && {
 	{ mount | grep jffs2 1>&-; } || firstboot
 }
-
-sysctl -p
diff --git a/target/default/target_skeleton/etc/init.d/S45firewall b/target/default/target_skeleton/etc/init.d/S45firewall
index da9fd550f3..7b55643123 100755
--- a/target/default/target_skeleton/etc/init.d/S45firewall
+++ b/target/default/target_skeleton/etc/init.d/S45firewall
@@ -32,13 +32,13 @@ iptables -t nat -N postrouting_rule
   iptables -A INPUT -i \! $WAN -j ACCEPT	# allow from lan/wifi interfaces 
   iptables -A INPUT -p icmp -j ACCEPT		# allow ICMP
   iptables -A INPUT -p 47 -j ACCEPT		# allow GRE
+  iptables -A INPUT -p tcp --syn --tcp-option \! 2 -j  DROP
   #
   # insert accept rule or to jump to new accept-check table here
   #
   iptables -A INPUT -j input_rule
 
   # reject (what to do with anything not allowed earlier)
-  iptables -A INPUT -p tcp --syn --tcp-option \! 2 -j  DROP
   iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset
   iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable
 
diff --git a/target/default/target_skeleton/etc/init.d/S99done b/target/default/target_skeleton/etc/init.d/S99done
index 70eef460d7..e69691c4b1 100755
--- a/target/default/target_skeleton/etc/init.d/S99done
+++ b/target/default/target_skeleton/etc/init.d/S99done
@@ -1,3 +1,4 @@
 #!/bin/sh
 # set leds to normal state
 echo "0x00" > /proc/sys/diag
+sysctl -np
diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides
index 8132c08e72..03cb2e0798 100644
--- a/target/default/target_skeleton/etc/nvram.overrides
+++ b/target/default/target_skeleton/etc/nvram.overrides
@@ -9,27 +9,35 @@
 # linksys bug; remove when not using static configuration for lan
 NVRAM_lan_proto="static"
 
+remap () {
+  for type in lan wifi wan pppoe
+  do
+    for s in '' s
+    do
+      eval NVRAM_${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" 
+    done
+  done
+}
+
 # hacks for wrt54g 1.x hardware
 [ "$(nvram get boardnum)"  = "42" ] && \
 [ "$(nvram get boardtype)" = "bcm94710dev" ] && {
-
-  # remap eth0 => vlan2, eth1 => vlan1
-  # for all *_ifname(s)
-
   debug "### wrt54g 1.x hack ###"
   NVRAM_vlan1hwname="et0"
   NVRAM_vlan2hwname="et0"
   FAILSAFE_ifnames="vlan1 vlan2 eth2"
+  remap eth0 vlan2
+  remap eth1 vlan1
+}
 
-  remap () {
-    eval NVRAM_$1=\"$(nvram get $1 | awk 'gsub("eth0","vlan2") gsub("eth1","vlan1")')\"
-  }
-
-  for type in lan wifi wan pppoe
-  do
-    remap ${type}_ifname
-    remap ${type}_ifnames
-  done
+# hacks for asus wl-500g deluxe
+[ "$(nvram get boardtype)" = "bcm95365r" ] && \
+[ "$(nvram get boardnum)" = "45" ] && {
+  debug "### wl-500g deluxe hacks ###"
+  NVRAM_vlan0hwname="et0"
+  NVRAM_vlan1hwname="et0"
+  FAILSAFE_ifnames="vlan0 vlan1 eth2"
+  remap eth0. vlan
 }
 
 # hacks for wap54g hardware
@@ -44,48 +52,33 @@ NVRAM_lan_proto="static"
 [ "$(nvram get boardnum)" = "00" ] && \
 [ "$(nvram get product_name)" = "Product_name" ] && {
   debug "### wla2-g54l hacks ###"
-  NVRAM_lan_ifnames="vlan0"
   NVRAM_wan_ifname="none"
+  NVRAM_lan_ifnames="vlan0"
 }
 
 # hack for asus wl-500g hardware
 [ "$(nvram get boardnum)"  = "asusX" ] && \
 [ "$(nvram get boardtype)"  = "bcm94710dev" ] && {
-  FAILSAFE_lan_ifnames="eth0 eth2"
-}
-
-# hacks for asus wl-500g deluxe
-[ "$(nvram get boardtype)" = "bcm95365r" ] && \
-[ "$(nvram get boardnum)" = "45" ] && {
-  debug "### wl-500g deluxe hacks ###"
-  NVRAM_vlan0hwname="et0"
-  NVRAM_vlan1hwname="et0"
-  NVRAM_lan_ifnames="vlan0 eth1"
-  [ "$(nvram get wan_ifname)" = "eth0.1" ] && {
-    NVRAM_wan_ifname="vlan1"
-  }
+  FAILSAFE_ifnames="eth0 eth2"
 }
 
 # defaults if lan_ifname is missing
 [ -z "$(nvram get lan_ifname)" ] && {
   NVRAM_lan_ifname="br0"
-  NVRAM_lan_ifnames=${FAILSAFE_lan_ifnames:-"vlan0 vlan2 eth1 eth2 eth3"}
+  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan2 eth1 eth2 eth3"}
 }
 
 # defaults if wan_ifname is missing
 [ -z "$(nvram get wan_ifname)" ] && {
    NVRAM_wan_ifname="vlan1"
    NVRAM_wan_proto="dhcp"
-   [ "$asus" ] && {
-     NVRAM_wan_ifname="eth1"
-   }
 }
 
 # failsafe if reset is held
 [ "$FAILSAFE" = "true" ] && {
   echo "### YOU ARE IN FAILSAFE MODE ####"
   NVRAM_lan_ifname="br0"
-  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1"}
+  NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1 eth2 eth3"}
   NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
   NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
   NVRAM_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}
diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index 72efa69012..4236de06b6 100755
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -45,11 +45,12 @@
       } done
     ;;
     dhcp)
+      ip=$(nvram get ${type}_ipaddr)
       pidfile=/tmp/dhcp-${type}.pid
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi
-      ${DEBUG:-eval} "udhcpc -i $if -b -p $pidfile &" 
+      ${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &" 
     ;;
     pppoe)
 	# handled by /etc/init.d/S50pppoe