diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-07 23:25:43 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-07 23:25:43 +0000 |
| commit | 97ee10d69172eacf4735ce1070bc0b21111a7b63 (patch) | |
| tree | 6dd2425f7d7ba1f8e475ea7739cc2503eaa0a157 /package/base-files/files | |
| parent | 6894dfb0fb9e983165b36dcce3042c4f4b130cf4 (diff) | |
| download | upstream-97ee10d69172eacf4735ce1070bc0b21111a7b63.tar.gz upstream-97ee10d69172eacf4735ce1070bc0b21111a7b63.tar.bz2 upstream-97ee10d69172eacf4735ce1070bc0b21111a7b63.zip | |
base-files: fix error reporting for unsupported protocols on virtual interfaces
SVN-Revision: 27132
Diffstat (limited to 'package/base-files/files')
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/ifup | 4 |
2 files changed, 3 insertions, 3 deletions
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 |