X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fifdown;h=f8ce81bcbdcfcbce8de811420112d6d58fbbc7cc;hb=ff77b035d0cc88faaf02d0df63d5a0d132d69406;hp=540c69f169115efe2981aa4b050ff1e9f7f6ca5a;hpb=ecec813b40cc99880644a13f521568cfef93f4cd;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 540c69f16..f8ce81bcb 100755
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -5,11 +5,17 @@
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 [ "x$1" = "x-a" ] && {
 	config_cb() {
-		[ -z "$2" ] || eval "$0 $2"
+		[ interface != "$1" -o -z "$2" ] || eval "$0 $2"
 	}
 	config_load network
 	exit
 }
+
+# remove the interface's network state
+FILE=/var/state/network.$$
+grep -v "^config_set '$1' " /var/state/network > "$FILE"
+mv "$FILE" /var/state/network
+
 include /lib/network
 scan_interfaces
 
@@ -20,8 +26,8 @@ config_get proto "$cfg" proto
 [ -z "$proto" ] && { echo "interface not found."; exit; }
 
 config_get iface "$cfg" device
-[ "$proto" = "static" ] && {
-	env -i ACTION="ifdown" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
+[ "static" = "$proto" ] && {
+	env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
 }
 
 # call interface stop handler
@@ -58,5 +64,5 @@ for dev in $ifname $device; do
 done
 
 config_get iftype "$cfg" type
-[ "$iftype" = "bridge" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null
+[ "bridge" = "$iftype" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null