From 857d350bc70160452b96bb423dd0396081ef30db Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 20 Jan 2007 15:28:47 +0000
Subject: [PATCH] ignore the bridge option if brctl is not available
SVN-Revision: 6145
---
.../base-files/files/lib/network/config.sh | 30 ++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index ffce9f6aa3..e68223e277 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -88,21 +88,23 @@ setup_interface() {
# Setup bridging
case "$iftype" in
bridge)
- ifconfig "$iface" up 2>/dev/null >/dev/null
- ifconfig "br-$config" 2>/dev/null >/dev/null && {
- $DEBUG brctl addif "br-$config" "$iface"
- return 0
- } || {
- $DEBUG brctl addbr "br-$config"
- $DEBUG brctl setfd "br-$config" 0
- $DEBUG brctl addif "br-$config" "$iface"
- iface="br-$config"
+ [ -x /usr/sbin/brctl ] && {
+ ifconfig "$iface" up 2>/dev/null >/dev/null
+ ifconfig "br-$config" 2>/dev/null >/dev/null && {
+ $DEBUG brctl addif "br-$config" "$iface"
+ return 0
+ } || {
+ $DEBUG brctl addbr "br-$config"
+ $DEBUG brctl setfd "br-$config" 0
+ $DEBUG brctl addif "br-$config" "$iface"
+ iface="br-$config"
- # need to bring up the bridge and wait a second for
- # it to switch to the 'forwarding' state, otherwise
- # it will lose its routes...
- ifconfig "$iface" up
- sleep 1
+ # need to bring up the bridge and wait a second for
+ # it to switch to the 'forwarding' state, otherwise
+ # it will lose its routes...
+ ifconfig "$iface" up
+ sleep 1
+ }
}
;;
esac
--
GitLab