oops, if -> type

[openwrt-10.03/.git] / root / etc / networking.sh

diff --git a/root/etc/networking.sh b/root/etc/networking.sh
index b857a86c062f045c5636c96e2609183797443da3..74e0023296f778da67479875915729af1cd98d4b 100755 (executable)
--- a/root/etc/networking.sh
+++ b/root/etc/networking.sh
@@ -84,8 +84,15 @@ configure () {
       ipcalc -s "$if_netmask" || return 
       $DEBUG ifconfig $if $if_ip netmask $if_netmask up
 
-      ipcalc -s "$ip_gateway" || return 
-      $DEBUG route add default gw $ip_gateway
+      ipcalc -s "$if_gateway" || return 
+      $DEBUG route add default gw $if_gateway
+
+      [ -f /etc/resolv.conf ] && return
+
+      echo "# --- creating /etc/resolv.conf ---"
+      for dns in $(nvram_get ${type}_dns); do {
+       echo "nameserver $dns" >> /etc/resolv.conf
+      }; done
     ;;
     dhcp)
       pidfile=/tmp/dhcp-${type}.pid
@@ -161,3 +168,12 @@ lan_proto="static"
 configure lan
 configure wifi
 configure wan
+
+for route in $(nvram_get static_route); do {
+      ip=${route%%:*} route=${route#*:}
+ netmask=${route%%:*} route=${route#*:}
+ gateway=${route%%:*} route=${route#*:}
+  metric=${route%%:*} route=${route#*:}
+      if=${route%%:*}
+  $DEBUG route add -net $ip netmask $netmask gw $gateway metric $metric dev $if
+} done