fix for multiple extra commands in init scripts using rc.common

[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 0d85ca8..4f5be8c 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -1,18 +1,50 @@
 #!/bin/sh
 #!/bin/sh

+# Copyright (C) 2006 OpenWrt.org
+

 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-. /etc/config/network
+include /lib/network
+scan_interfaces
+
+cfg=$1
+debug "### ifdown $cfg ###"
+
+config_get proto "$cfg" proto
+[ -z "$proto" ] && { echo "interface not found."; exit; }
+
+# call interface stop handler
+( type "stop_interface_$proto" ) >/dev/null 2>/dev/null && eval "stop_interface_$proto '$cfg'"
+
+# make sure all locks are removed
+for lock in "/var/lock/dhcp-$iface" "/var/lock/ppp-$iface"; do
+       [ -f "$lock" ] && {
+               lock -u "$lock"
+               sleep 1
+       }
+done
+
+# kill active ppp daemon and other processes
+config_get ifname "$cfg" ifname
+pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)"
+for pid in $pids; do 
+       [ -d "/proc/$pid" ] && {
+               kill $pid
+               [ -d "/proc/$pid" ] && {
+                       sleep 1
+                       kill -9 $pid 2>/dev/null >/dev/null
+               }
+       }
+done
+rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid

 
 

-debug "### ifdown $type ###"
-type=$1
+config_get ifname "$cfg" ifname
+config_get device "$cfg" ifname

 
 

-eval "if_proto=\"\${${type}_proto}\""
-eval "if=\"\${${type}_ifname}\""
-[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""
+[ ."$device" != ."$ifname" ] || device=
+for dev in $ifname $device; do
+       ifconfig "$ifname" 0.0.0.0 down >/dev/null 2>/dev/null
+done

 
 

-case "$if_proto" in
-       pppoa) hotplug_dev unregister atm0; exit 0 ;;
-       ""|none) exit 0;;
-esac
+config_get iftype "$cfg" type
+[ "$iftype" = "bridge" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null

 
 

-hotplug_dev unregister "$if"