large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

[openwrt.git] / openwrt / package / base-files / default / sbin / ifup

diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index 0a2cdf5..a86a767 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -1,30 +1,34 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network

 
 ifdown $1
 
 debug "### ifup $type ###"
 type=$1
 
 
 ifdown $1
 
 debug "### ifup $type ###"
 type=$1
 

-if_proto=$(nvram get ${type}_proto)
-if=$(nvram get ${type}_ifname)
+eval "if_proto=\"\${${type}_proto}\""
+eval "if=\"\${${type}_ifname}\""
+[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""

 
 case "$if_proto" in
        pppoa) hotplug_dev register atm0; exit 0 ;;
        pppoe)
 
 case "$if_proto" in
        pppoa) hotplug_dev register atm0; exit 0 ;;
        pppoe)

-               ifconfig nas0 2>&- >&- || {
-                       hotplug_dev register atm0
-                       exit 0
+               # PPPoE over ATM
+               [ "$if" = "nas0" ] && {
+                       ifconfig nas0 2>&- >&- || {
+                               hotplug_dev register atm0
+                               exit 0
+                       }

                }
        ;;
        none|"") exit 0;;
 esac
 
 if [ "${if%%[0-9]}" = "br" ]; then
                }
        ;;
        none|"") exit 0;;
 esac
 
 if [ "${if%%[0-9]}" = "br" ]; then

-       for sif in $(nvram get ${type}_ifnames); do
+       eval "ifnames=\"\${${type}_ifnames}\""
+       for sif in $ifnames; do

                hotplug_dev register "$sif"
        done
 else
                hotplug_dev register "$sif"
        done
 else