From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 20 Nov 2015 23:52:31 +0000 (+0000)
Subject: mpc85xx: migrate network setup to board detection framework
X-Git-Tag: reboot~1508
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e79f25991cfc6d06f7cba7333693401f2d813de;p=oweals%2Fopenwrt.git

mpc85xx: migrate network setup to board detection framework

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47540
---

diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..dff24c040a
--- /dev/null
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright (C) 2014-2015 OpenWrt.org
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/mpc85xx.sh
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+board_config_update
+
+ucidef_set_interface_loopback
+
+board=$(mpc85xx_board_name)
+
+case "$board" in
+tl-wdr4900-v1)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	ucidef_add_switch_vlan "switch0" "2" "0t 1"
+	;;
+*)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network b/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network
deleted file mode 100644
index 525a552a73..0000000000
--- a/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014 OpenWrt.org
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
-. /lib/mpc85xx.sh
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-ucidef_set_interface_loopback
-
-board=$(mpc85xx_board_name)
-
-case "$board" in
-tl-wdr4900-v1)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-	ucidef_add_switch "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
-	ucidef_add_switch_vlan "switch0" "2" "0t 1"
-	;;
-*)
-	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	;;
-esac
-
-uci commit network
-
-exit 0