소스 검색

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

SVN-Revision: 18432
Jo-Philipp Wich 16 년 전
부모
커밋
a4b1848387
1개의 변경된 파일35개의 추가작업 그리고 1개의 파일을 삭제
  1. 35 1
      target/linux/brcm-2.4/base-files/etc/init.d/netconfig

+ 35 - 1
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