aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-03-14 21:10:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-03-14 21:10:07 +0000
commit73f61a64eba854ea115feecbed97c0a35907d914 (patch)
tree1b991baf996fab8712a125e02650c8c040ed8bc6
parentd58bf6adba59dc0b58bd3baa44472639c9f43631 (diff)
downloadupstream-73f61a64eba854ea115feecbed97c0a35907d914.tar.gz
upstream-73f61a64eba854ea115feecbed97c0a35907d914.tar.bz2
upstream-73f61a64eba854ea115feecbed97c0a35907d914.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> SVN-Revision: 20218
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
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