From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 22:46:54 +0000 (+0000)
Subject: netlogic: switch from uci-defaults to board.d
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=25cfd7f0d389cb1c619b58156d16aea43e35c5e9

netlogic: switch from uci-defaults to board.d

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

SVN-Revision: 47736
---

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/board.d/02_network b/target/linux/netlogic/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..1ca1214535
--- /dev/null
+++ b/target/linux/netlogic/base-files/etc/board.d/02_network
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-now.sh
+. /lib/netlogic.sh
+
+board_config_update
+
+case "$board_name" in
+"xlp-evp" |\
+"xlp-fvp" |\
+"xlp-gvp" |\
+"xlp-svp" |\
+*)
+	ucidef_set_interface_lan "eth0"
+	;;
+
+esac
+
+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/uci-defaults/02_network
deleted file mode 100644
index e271e17097..0000000000
--- a/target/linux/netlogic/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,28 +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/netlogic.sh
-
-ucidef_set_interface_loopback
-
-case "$board_name" in
-"xlp-evp" |\
-"xlp-fvp" |\
-"xlp-gvp" |\
-"xlp-svp" |\
-*)
-	ucidef_set_interface_lan "eth0"
-	;;
-
-esac
-
-uci commit network
-
-exit 0