Merged enhancements submitted by Stereo, thanks, closes #188 and #189

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

diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index f2f8bbfe8168d9065aa3b30162c802a1ba346c5d..85bb2fbc5db0033562d59a789ce55a279d389839 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -1,19 +1,26 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
-. /etc/network.overrides  
+. /etc/network.overrides
 [ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
-type=$1
 debug "### ifdown $type ###"
+type=$1
 
+if_proto=$(nvram get ${type}_proto)
 if=$(nvram get ${type}_ifname)
-proto=$(nvram get ${type}_proto)
-if_valid $if && $DEBUG ifconfig $if down
-kill $(cat /var/run/${if}.pid 2>&-) 2>&-
-killall ifup.$proto >&- 2>&-
-case "$proto" in
-       pptp|pppoe) killall pppd >&- 2>&- ;;
-       static) env -i ACTION="ifdown" INTERFACE="$if" PROTO=static /sbin/hotplug "iface" ;;
+
+case "$if_proto" in
+       pppoa) hotplug_dev unregister atm0; exit 0 ;;
+       ""|none) exit 0;;
 esac
 
+[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"
+
+if [ "${if%%[0-9]}" = "br" ]; then
+       for sif in $(nvram get ${type}_ifnames); do
+               hotplug_dev unregister "$sif"
+       done
+fi
+       
+hotplug_dev unregister "$if"