[backfire] merge r27132

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27133 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index adb502b4cb044800d5b01436c71d61f5eefac748..9a1ef17229f70e0233a0fa96aa5a341a87ab3573 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.18
+PKG_RELEASE:=43.19
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index be431e63747e8502a68156ea00fe0a3f22c316d1..cb3cec515030786db34e179294b9f917a488c8ed 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -325,7 +325,7 @@ setup_interface() {
        }
 
        # Interface settings
-       grep "$iface:" /proc/net/dev > /dev/null && {
+       grep -qE "^ *$iface:" /proc/net/dev && {
                local mtu macaddr
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr

diff --git a/package/base-files/files/sbin/ifup b/package/base-files/files/sbin/ifup
index 96f7bea3576d9f4dec98bb6b7e98beb99a825753..6acd2ed09978276636c6a1a27f27453d67b701b5 100755 (executable)
--- a/package/base-files/files/sbin/ifup
+++ b/package/base-files/files/sbin/ifup
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 /sbin/ifdown "$@"
 
@@ -18,6 +18,6 @@ include /lib/network
 scan_interfaces
 
 config_get ifname "$1" device
-for dev in $ifname; do
+for dev in ${ifname:-$1}; do
        setup_interface "$dev" "$1"
 done