aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/network
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-08-01 03:01:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-08-01 03:01:25 +0000
commitadc5b4a36f5f9ac32e4e5beee3fbc322d7633876 (patch)
treea3039aab194852fa4cb1d1749d56fb101ee14770 /package/base-files/files/lib/network
parent02c8979f05a33526b29714050c41dca548c190f6 (diff)
downloadupstream-adc5b4a36f5f9ac32e4e5beee3fbc322d7633876.tar.gz
upstream-adc5b4a36f5f9ac32e4e5beee3fbc322d7633876.tar.bz2
upstream-adc5b4a36f5f9ac32e4e5beee3fbc322d7633876.zip
avoid duplicate vlan add events
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12057 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib/network')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index b3e9fed3fb..0a7464495f 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -61,7 +61,9 @@ add_vlan() {
[ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"
$DEBUG vconfig add "$vif" "${1##*\.}"
+ return 0
}
+ return 1
}
# sort the device list, drop duplicates
@@ -94,7 +96,7 @@ prepare_interface() {
}
# Setup VLAN interfaces
- add_vlan "$iface"
+ add_vlan "$iface" && return 1
ifconfig "$iface" 2>/dev/null >/dev/null || return 0
# Setup bridging