add 1 second delay for natsemi ifup (sometimes won't come up otherwise)

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

diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index d0120dc..073e80d 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -1,26 +1,34 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+include /lib/network
+scan_interfaces
+
+cfg=$1
+debug "### ifdown $cfg ###"
 
-debug "### ifdown $type ###"
-type=$1
+config_get proto "$cfg" proto
+[ -z "$proto" ] && { echo "interface not found."; exit; }
 
-if_proto=$(nvram get ${type}_proto)
-if=$(nvram get ${type}_ifname)
+# kill active ppp daemon
+pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
+[ -n "$pid" -a -d "/proc/$pid" ] && {
+       kill $pid
+       sleep 1
+       [ -d "/proc/$pid" ] && kill -9 $pid
+}
 
-case "$if_proto" in
-       pppoa) hotplug_dev unregister atm0; exit 0 ;;
-       ""|none) exit 0;;
-esac
+# kill any other process associated with the interface
+config_get ifname "$cfg" ifname
+pid="$(cat /var/run/${ifname}.pid 2>/dev/null)"
+[ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid
 
-[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)"
+config_get ifname "$cfg" ifname
+ifconfig "$ifname" >/dev/null 2>/dev/null && {
+       ifconfig "$ifname" 0.0.0.0 down
 
-if [ "${if%%[0-9]}" = "br" ]; then
-       for sif in $(nvram get ${type}_ifnames); do
-               hotplug_dev unregister "$sif"
-       done
-fi
-       
-hotplug_dev unregister "$if"
+       config_get iftype "$cfg" type
+       [ "$iftype" = "bridge" ] && brctl delbr "$ifname"
+}