fix shell escaping bug in append() function

[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 50ffee5..073e80d 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -3,18 +3,32 @@
 
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-. /etc/config/network
+include /lib/network
+scan_interfaces

 
 

-debug "### ifdown $type ###"
-type=$1
+cfg=$1
+debug "### ifdown $cfg ###"

 
 

-eval "if_proto=\"\${${type}_proto}\""
-eval "if=\"\${${type}_ifname}\""
-[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""
+config_get proto "$cfg" proto
+[ -z "$proto" ] && { echo "interface not found."; exit; }

 
 

-case "$if_proto" in
-       pppoa) hotplug_dev unregister atm0; exit 0 ;;
-       ""|none) exit 0;;
-esac
+# 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
+}

 
 

-hotplug_dev unregister "$if"
+# 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
+
+config_get ifname "$cfg" ifname
+ifconfig "$ifname" >/dev/null 2>/dev/null && {
+       ifconfig "$ifname" 0.0.0.0 down
+
+       config_get iftype "$cfg" type
+       [ "$iftype" = "bridge" ] && brctl delbr "$ifname"
+}