Fixed network autoconfiguration as explained in #200, fixes #200

[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 3d81364..67e01a3 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -1,59 +1,34 @@
-#!/bin/ash
+#!/bin/sh

 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

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

 debug "### ifup $type ###"
 debug "### ifup $type ###"

+type=$1

 
 if_proto=$(nvram get ${type}_proto)
 if=$(nvram get ${type}_ifname)
 
 if_proto=$(nvram get ${type}_proto)
 if=$(nvram get ${type}_ifname)

-[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)

 
 

-if_valid $if || exit 
-mac=$(nvram get ${type}_hwaddr)
-$DEBUG ifconfig $if down 2>&-
+case "$if_proto" in
+       pppoa) hotplug_dev register atm0; exit 0 ;;
+       pppoe)
+               ifconfig nas0 2>&- >&- || {
+                       hotplug_dev register atm0
+                       exit 0
+               }
+       ;;
+       none|"") exit 0;;
+esac
+
+[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"

 
 if [ "${if%%[0-9]}" = "br" ]; then
 
 if [ "${if%%[0-9]}" = "br" ]; then

-       stp=$(nvram get ${type}_stp)
-       $DEBUG brctl delbr $if 2>&-
-       $DEBUG brctl addbr $if
-       $DEBUG brctl setfd $if 0
-       $DEBUG brctl stp $if ${stp:-0}
-

        for sif in $(nvram get ${type}_ifnames); do
        for sif in $(nvram get ${type}_ifnames); do

-               if_valid $sif || continue
-               ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
-               $DEBUG ifconfig $sif 0.0.0.0 up
-               $DEBUG brctl addif $if $sif
+               hotplug_dev register "$sif"

        done
 else
        done
 else

-       ${mac:+$DEBUG ifconfig $if down hw ether $mac}
+       hotplug_dev register "$if"

 fi
 fi

-
-case "$if_proto" in
-       static)
-               ip=$(nvram get ${type}_ipaddr)
-               netmask=$(nvram get ${type}_netmask)
-               gateway=$(nvram get ${type}_gateway)
-
-               $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
-               ${gateway:+$DEBUG route add default gw $gateway}
-
-               [ -f /etc/resolv.conf ] && return
-
-               debug "# --- creating /etc/resolv.conf ---"
-               for dns in $(nvram get ${type}_dns); do
-                       echo "nameserver $dns" >> /etc/resolv.conf
-               done
-       ;;
-       dhcp)
-               ip=$(nvram get ${type}_ipaddr)
-               [ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
-               ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
-       ;;
-       none|"")
-       ;;
-       *)
-               [ -x "/sbin/ifup.${if_proto}" ] && { $DEBUG /sbin/ifup.${if_proto} $*; exit; }
-               echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)"
-       ;;
-esac