X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ecec813b40cc99880644a13f521568cfef93f4cd..8785e41158918c4bd966e7f43947865e462cabf7:/package/base-files/files/sbin/ifdown diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown index 540c69f16..08433c75c 100755 --- a/package/base-files/files/sbin/ifdown +++ b/package/base-files/files/sbin/ifdown @@ -5,11 +5,19 @@ [ $# = 0 ] && { echo " $0 "; exit; } [ "x$1" = "x-a" ] && { config_cb() { - [ -z "$2" ] || eval "$0 $2" + [ interface != "$1" -o -z "$2" ] || eval "$0 $2" } config_load network exit } + +config_load /var/state/network + +# 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 +28,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 +66,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