From 81f1ccbf967a211449b0726ff476f079e3df1bcb Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 23:07:38 +0000
Subject: [PATCH] at91: switch from uci-defaults to board.d

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

SVN-Revision: 47740
---
 target/linux/at91/base-files/etc/board.d/00_model   | 13 +++++++++++++
 .../etc/{uci-defaults => board.d}/02_network        | 12 ++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100755 target/linux/at91/base-files/etc/board.d/00_model
 rename target/linux/at91/base-files/etc/{uci-defaults => board.d}/02_network (50%)

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/uci-defaults/02_network b/target/linux/at91/base-files/etc/board.d/02_network
similarity index 50%
rename from target/linux/at91/base-files/etc/uci-defaults/02_network
rename to target/linux/at91/base-files/etc/board.d/02_network
index 5df138c72c..fc3e112f02 100755
--- a/target/linux/at91/base-files/etc/uci-defaults/02_network
+++ b/target/linux/at91/base-files/etc/board.d/02_network
@@ -1,16 +1,12 @@
 #!/bin/sh
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/at91.sh
 
-ucidef_set_interface_loopback
+board_config_update
 
 case "$(at91_board_name)" in
 
@@ -24,6 +20,6 @@ sama5d3_xplained)
 
 esac
 
-uci commit network
+board_config_flush
 
 exit 0