From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 23:07:38 +0000 (+0000)
Subject: at91: switch from uci-defaults to board.d
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=81f1ccbf967a211449b0726ff476f079e3df1bcb;p=openwrt%2Fstaging%2Fzorun.git

at91: switch from uci-defaults to board.d

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

SVN-Revision: 47740
---

diff --git a/target/linux/at91/base-files/etc/board.d/00_model b/target/linux/at91/base-files/etc/board.d/00_model
new file mode 100755
index 0000000000..ec07709e0c
--- /dev/null
+++ b/target/linux/at91/base-files/etc/board.d/00_model
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Copyright (C) 2015 OpenWrt.org
+
+. /lib/functions/uci-defaults-new.sh
+
+board_config_update
+
+ucidef_set_board_id "$(cat /tmp/sysinfo/board_name)"
+ucidef_set_model_name "$(cat /tmp/sysinfo/model)"
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/at91/base-files/etc/board.d/02_network b/target/linux/at91/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..fc3e112f02
--- /dev/null
+++ b/target/linux/at91/base-files/etc/board.d/02_network
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Copyright (C) 2014-2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/at91.sh
+
+board_config_update
+
+case "$(at91_board_name)" in
+
+sama5d3_xplained)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	;;
+
+*)
+	ucidef_set_interface_lan "eth0"
+	;;
+
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/at91/base-files/etc/uci-defaults/02_network b/target/linux/at91/base-files/etc/uci-defaults/02_network
deleted file mode 100755
index 5df138c72c..0000000000
--- a/target/linux/at91/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,29 +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/at91.sh
-
-ucidef_set_interface_loopback
-
-case "$(at91_board_name)" in
-
-sama5d3_xplained)
-	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	;;
-
-*)
-	ucidef_set_interface_lan "eth0"
-	;;
-
-esac
-
-uci commit network
-
-exit 0