From 1f75fe411e6b949b0bc6c651aecd319ca110a468 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 1 Aug 2008 03:01:25 +0000 Subject: avoid duplicate vlan add events git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12057 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/network/config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package/base-files') diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index b3e9fed3f..0a7464495 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 -- cgit v1.2.3