fix bogus "interface not found" errors in ifup -a (#1580)

[openwrt/svn-archive/archive.git] / package / base-files / files / sbin / ifdown

diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 26d0e626d2dde9bb02e076efafa53b769ad41a89..8c36a25b48d2bfc4ec8c494bf39f1d7fea820a94 100755 (executable)
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -1,8 +1,15 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-[ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
+[ $# = 0 ] && { echo "  $0 <group>"; exit; }
+[ "x$1" = "x-a" ] && {
+       config_cb() {
+               [ interface != "$1" -o -z "$2" ] || eval "$0 $2"
+       }
+       config_load network
+       exit
+}
 include /lib/network
 scan_interfaces
 
@@ -14,7 +21,7 @@ config_get proto "$cfg" proto
 
 config_get iface "$cfg" device
 [ "$proto" = "static" ] && {
-       env -i ACTION="ifdown" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
+       env -i ACTION="ifdown" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
 }
 
 # call interface stop handler
@@ -43,11 +50,11 @@ 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