X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fifdown;h=8de414d8b6dd96ad349b52ffe97e5a398f562fc8;hb=b8df1b4c802a0f113d48456b093e73f20c0cef45;hp=26d0e626d2dde9bb02e076efafa53b769ad41a89;hpb=05adaa9794e41d02870a74a1ed7ba58cc59b9286;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 26d0e626d..8de414d8b 100755
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -1,8 +1,17 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-[ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
+[ $# = 0 ] && { echo "  $0 <group>"; exit; }
+[ "x$1" = "x-a" ] && {
+	[ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto
+	config_cb() {
+		[ interface != "$1" -o -z "$2" ] || eval "$0 $2"
+	}
+	config_load network
+	exit
+}
+
 include /lib/network
 scan_interfaces
 
@@ -13,8 +22,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" -o "none" = "$proto" ] && {
+	env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO="$proto" /sbin/hotplug-call "iface"
 }
 
 # call interface stop handler
@@ -43,13 +52,21 @@ done
 rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid
 
 config_get ifname "$cfg" ifname
-config_get device "$cfg" ifname
+config_get device "$cfg" device
 
 [ ."$device" != ."$ifname" ] || device=
 for dev in $ifname $device; do
-	ifconfig "$ifname" 0.0.0.0 down >/dev/null 2>/dev/null
+	ifconfig "$dev" 0.0.0.0 down >/dev/null 2>/dev/null
 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
+
+# remove the interface's network state
+uci_revert_state network "$1"
 
+# revert aliases state as well
+config_get aliases "$1" aliases
+for config in $aliases; do
+	uci_revert_state network "$config"
+done