summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-07 23:25:43 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-07 23:25:43 +0000
commit83f0561da1d84d9a18f0019a3ec4bb44a6516b7e (patch)
treef43af0ae16df039d96179914240317bae50a5919
parentc7b279aebe287a643cb3174abe3707cdf8c41ad8 (diff)
[package] base-files: fix error reporting for unsupported protocols on virtual interfaces
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27132 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
-rwxr-xr-xpackage/base-files/files/sbin/ifup4
3 files changed, 4 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5e6e65271..2ad6bdd51 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 c262282fa..7e4a53d0a 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 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