aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-03 23:07:38 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-03 23:07:38 +0000
commit54904b87a45e8848d8f2a2c4d3732619ccb25998 (patch)
tree4656717f8e06a297e50375ae4b1912d834b68884
parent23d1c880f4908aa99c06ec45f3a40b20f0b31948 (diff)
downloadmaster-187ad058-54904b87a45e8848d8f2a2c4d3732619ccb25998.tar.gz
master-187ad058-54904b87a45e8848d8f2a2c4d3732619ccb25998.tar.bz2
master-187ad058-54904b87a45e8848d8f2a2c4d3732619ccb25998.zip
at91: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47740 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/at91/base-files/etc/board.d/00_model13
-rwxr-xr-xtarget/linux/at91/base-files/etc/board.d/02_network (renamed from target/linux/at91/base-files/etc/uci-defaults/02_network)12
2 files changed, 17 insertions, 8 deletions
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
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