1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 16:21:06 +02:00

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
This commit is contained in:
nbd 2010-03-14 21:10:07 +00:00
parent 46f715372d
commit 176d390d98

View File

@ -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