From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 15 Nov 2009 23:19:39 +0000 (+0000)
Subject: [brcm-2.4] add migration code to automatically convert old to new switch config on... 
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=1477f1e30e335b9ad2df451636277c714dc37797

[brcm-2.4] add migration code to automatically convert old to new switch config on first boot, this will be removed at some point in the future


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18432 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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 4d66962f9..b5d900a73 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