X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/db684723c4cf2a2f7316f4c3bbeace9b0f2e3a17..93701b2bec2b99d8113d8a6d9b97153e87a7e5aa:/openwrt/package/base-files/default/sbin/ifup?ds=sidebyside diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup index c46fff65c..a86a7671e 100755 --- a/openwrt/package/base-files/default/sbin/ifup +++ b/openwrt/package/base-files/default/sbin/ifup @@ -1,64 +1,36 @@ -#!/bin/ash +#!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network +. /etc/config/network -type=$1 -debug "### ifup $type ###" +ifdown $1 -if_proto=$(nvram get ${type}_proto) -if=$(nvram get ${type}_ifname) -[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname) +debug "### ifup $type ###" +type=$1 -if_valid $if || exit -mac=$(nvram get ${type}_hwaddr) -$DEBUG ifconfig $if down 2>&- +eval "if_proto=\"\${${type}_proto}\"" +eval "if=\"\${${type}_ifname}\"" +[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\"" -pidfile=/var/run/${if}.pid -[ -f $pidfile ] && $DEBUG kill $(cat $pidfile) +case "$if_proto" in + pppoa) hotplug_dev register atm0; exit 0 ;; + pppoe) + # PPPoE over ATM + [ "$if" = "nas0" ] && { + ifconfig nas0 2>&- >&- || { + hotplug_dev register atm0 + exit 0 + } + } + ;; + none|"") exit 0;; +esac 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 - 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 + eval "ifnames=\"\${${type}_ifnames}\"" + for sif in $ifnames; do + hotplug_dev register "$sif" done else - ${mac:+$DEBUG ifconfig $if down hw ether $mac} + hotplug_dev register "$if" 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