aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/netlogic
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-03 22:46:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-03 22:46:54 +0000
commit151bc673dc1fc9869de573cfb0c52bbed564856f (patch)
tree607c5563a5aeb981c39aaeca460897069488d312 /target/linux/netlogic
parent005f3f6ebd5b3cd199ad77c784f95781bd89c319 (diff)
downloadmaster-187ad058-151bc673dc1fc9869de573cfb0c52bbed564856f.tar.gz
master-187ad058-151bc673dc1fc9869de573cfb0c52bbed564856f.tar.bz2
master-187ad058-151bc673dc1fc9869de573cfb0c52bbed564856f.zip
netlogic: 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@47736 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/netlogic')
-rwxr-xr-xtarget/linux/netlogic/base-files/etc/board.d/00_model13
-rwxr-xr-x[-rw-r--r--]target/linux/netlogic/base-files/etc/board.d/02_network (renamed from target/linux/netlogic/base-files/etc/uci-defaults/02_network)10
2 files changed, 16 insertions, 7 deletions
diff --git a/target/linux/netlogic/base-files/etc/board.d/00_model b/target/linux/netlogic/base-files/etc/board.d/00_model
new file mode 100755
index 0000000000..ec07709e0c
--- /dev/null
+++ b/target/linux/netlogic/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/netlogic/base-files/etc/uci-defaults/02_network b/target/linux/netlogic/base-files/etc/board.d/02_network
index e271e17097..1ca1214535 100644..100755
--- a/target/linux/netlogic/base-files/etc/uci-defaults/02_network
+++ b/target/linux/netlogic/base-files/etc/board.d/02_network
@@ -3,14 +3,10 @@
# Copyright (C) 2014 OpenWrt.org
#
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-now.sh
. /lib/netlogic.sh
-ucidef_set_interface_loopback
+board_config_update
case "$board_name" in
"xlp-evp" |\
@@ -23,6 +19,6 @@ case "$board_name" in
esac
-uci commit network
+board_config_flush
exit 0