From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 7 Jun 2011 23:25:43 +0000 (+0000)
Subject: base-files: fix error reporting for unsupported protocols on virtual interfaces
X-Git-Tag: reboot~16598
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97ee10d69172eacf4735ce1070bc0b21111a7b63;p=oweals%2Fopenwrt.git

base-files: fix error reporting for unsupported protocols on virtual interfaces

SVN-Revision: 27132
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5e6e652716..2ad6bdd516 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:=71
+PKG_RELEASE:=72
 
 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 c262282faa..7e4a53d0a7 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 txqueuelen
 		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 96f7bea357..6acd2ed099 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