From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Jun 2011 23:26:52 +0000 (+0000)
Subject: [backfire] merge r27132
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=a19915e1c3bdc6f39a39f676058654425b52b43c

[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 adb502b4c..9a1ef1722 100644
--- 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 be431e637..cb3cec515 100755
--- 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 96f7bea35..6acd2ed09 100755
--- 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