diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-03-14 21:10:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-14 21:10:07 +0000 |
| commit | 17cf7bef792c5b579aea45f5a6e8d15437d6f173 (patch) | |
| tree | 6152763758c48cd3923d82e5f3093ee8c5f867a6 /package/base-files | |
| parent | ee7f33508ebae5ffe5f675e885931f20fcb95418 (diff) | |
| download | upstream-17cf7bef792c5b579aea45f5a6e8d15437d6f173.tar.gz upstream-17cf7bef792c5b579aea45f5a6e8d15437d6f173.tar.bz2 upstream-17cf7bef792c5b579aea45f5a6e8d15437d6f173.zip | |
fix error output of brctl if bridging is not supported.
The following error is displayed during network configuration on any device that has DEVICE_TYPE set to something else then router, or has brctl functionality disabled through some other method:
"brctl: SIOCGIFBR: Package not installed"
This is due to the unbridge function being called, which uses "brctl show" to determine if the interface is bridged.
Signed-off-by: Ithamar R. Adema <ithamar.adema@team-embedded.nl>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20218 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index b7d7b259a9..e64198b7f6 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -337,7 +337,7 @@ unbridge() { local brdev [ -x /usr/sbin/brctl ] || return 0 - brctl show | grep "$dev" >/dev/null && { + brctl show 2>/dev/null | grep "$dev" >/dev/null && { # interface is still part of a bridge, correct that for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do |