sync base-files with whiterussian

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

diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index 5dac3f9..be7075b 100755 (executable)
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -1,6 +1,10 @@
 #!/bin/ash
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
+
 . /etc/functions.sh
+. /etc/network.overrides
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+
 type=$1
 debug "### ifup $type ###"
 
@@ -8,13 +12,10 @@ 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 
+if_valid $if || [ "$if_proto" = "pptp" ] || exit 
 mac=$(nvram get ${type}_hwaddr)
 $DEBUG ifconfig $if down 2>&-
 
-pidfile=/var/run/${if}.pid
-[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
-
 if [ "${if%%[0-9]}" = "br" ]; then
        stp=$(nvram get ${type}_stp)
        $DEBUG brctl delbr $if 2>&-
@@ -32,30 +33,4 @@ else
        ${mac:+$DEBUG ifconfig $if down hw ether $mac}
 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)
-               ${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
+do_ifup $if_proto $type