aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-27 23:34:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-27 23:34:14 +0000
commit81b82549d68221b25ea53d8a6ea497b0257ac755 (patch)
tree631d540ec1385509c9ea4b99d9ef40cd0a6c1e39
parentf5685b7e3e77317dd3027fdb64a9bfc0e4d8b2a4 (diff)
downloadmaster-187ad058-81b82549d68221b25ea53d8a6ea497b0257ac755.tar.gz
master-187ad058-81b82549d68221b25ea53d8a6ea497b0257ac755.tar.bz2
master-187ad058-81b82549d68221b25ea53d8a6ea497b0257ac755.zip
add a check for brctl in the unbridge() function (fixes #1417)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6410 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 2b1574937b..95954bf15a 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -195,7 +195,8 @@ setup_interface() {
unbridge() {
local dev="$1"
local brdev
-
+
+ [ -x /usr/sbin/brctl ] || return 0
brctl show | grep "$dev" >/dev/null && {
# interface is still part of a bridge, correct that