X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm-2.4%2Fbase-files%2Fetc%2Finit.d%2Fnetconfig;h=b5d900a73b2dd84ea609b5ec0a6a920c8f318e01;hb=c52f2de355e1b9484c841577e02cc42422dbe4cc;hp=4d66962f98fc88b88a4855f2ccee3428bd2bdf50;hpb=6358fcc35bdd1f75df9e35132f2bf37051520d4d;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index 4d66962f98..b5d900a73b 100755
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
@@ -4,7 +4,41 @@
 START=05
 
 start() {
-	[ -e /etc/config/network ] && exit 0
+	[ -e /etc/config/network ] && {
+		local batch
+
+		config_cb() {
+			case "$1" in
+			switch)
+				option_cb() {
+					case "$1" in
+					vlan[0-9]|vlan1[0-5])
+						local id="${1#vlan}"
+						append batch "delete network.eth0.${1}${N}"
+						append batch "set network.eth0_${n}=switch_vlan${N}"
+						append batch "set network.eth0_${n}.device=eth0${N}"
+						append batch "set network.eth0_${n}.vlan=${id}${N}"
+						append batch "set network.eth0_${n}.ports='${2}'${N}"
+					;;
+					esac
+				}
+			;;
+			switch_vlan)
+				option_cb() { :; }
+				batch=""
+			;;
+			esac
+		}
+
+		config_load network
+
+		[ -n "$batch" ] && {
+			logger -t netconfig "migrating switch config to new format ..."
+			echo "$batch${N}commit network" | uci batch
+		}
+
+		exit 0
+	}
 
 	mkdir -p /etc/config