[package] base-files: fix error reporting for unsupported protocols on virtual interfaces
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 7 Jun 2011 23:25:43 +0000 (23:25 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 7 Jun 2011 23:25:43 +0000 (23:25 +0000)
SVN-Revision: 27132

package/base-files/Makefile
package/base-files/files/lib/network/config.sh
package/base-files/files/sbin/ifup

index 5e6e652..2ad6bdd 100644 (file)
@@ -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
index c262282..7e4a53d 100755 (executable)
@@ -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
index 96f7bea..6acd2ed 100755 (executable)
@@ -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