[backfire] merge r27132

[openwrt-10.03/.git] / package / base-files / files / sbin / ifup

diff --git a/package/base-files/files/sbin/ifup b/package/base-files/files/sbin/ifup
index 81ec2c08908a8f168b0ce1d396525af292a40c48..6acd2ed09978276636c6a1a27f27453d67b701b5 100755 (executable)
--- a/package/base-files/files/sbin/ifup
+++ b/package/base-files/files/sbin/ifup
@@ -1,11 +1,23 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
-. /sbin/ifdown "$@"
+/sbin/ifdown "$@"
 
-config_get iftype "$1" type
-config_get ifname "$1" device
+. /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
 
-for dev in $ifname; do
+config_get ifname "$1" device
+for dev in ${ifname:-$1}; do
        setup_interface "$dev" "$1"
 done