From 176d390d98f9aeb1b86f85c2e864fc30c441fe1c Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 14 Mar 2010 21:10:07 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20218 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/network/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index b7d7b259a..e64198b7f 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 -- cgit v1.2.3