From 7514b6d73b7cad9e6f13ae9527eeee39630a10a8 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 22:27:18 +0000
Subject: [PATCH] kirkwood: switch from uci-defaults to board.d

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

SVN-Revision: 47733
---
 .../kirkwood/base-files/etc/board.d/00_model  | 13 +++++++++
 .../etc/{uci-defaults => board.d}/01_leds     | 12 ++++----
 .../etc/{uci-defaults => board.d}/02_network  | 28 +++++++++----------
 3 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 target/linux/kirkwood/base-files/etc/board.d/00_model
 rename target/linux/kirkwood/base-files/etc/{uci-defaults => board.d}/01_leds (80%)
 rename target/linux/kirkwood/base-files/etc/{uci-defaults => board.d}/02_network (56%)

diff --git a/target/linux/kirkwood/base-files/etc/board.d/00_model b/target/linux/kirkwood/base-files/etc/board.d/00_model
new file mode 100644
index 0000000000..ec07709e0c
--- /dev/null
+++ b/target/linux/kirkwood/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/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds
similarity index 80%
rename from target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
rename to target/linux/kirkwood/base-files/etc/board.d/01_leds
index d6c0e1e15e..9e84d8bb20 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/kirkwood.sh
 
+board_config_update
+
 board=$(kirkwood_board_name)
 
 case "$board" in
@@ -22,8 +24,8 @@ case "$board" in
 	;;
 "goflexhome" | \
 "goflexnet")
-        ucidef_set_led_default "health" "health" "status:green:health" "1"
-        ucidef_set_led_default "fault" "fault" "status:orange:fault" "0"
+	ucidef_set_led_default "health" "health" "status:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "status:orange:fault" "0"
 	;;
 "ib62x0")
 	ucidef_set_led_default "health" "health" "ib62x0:green:os" "1"
@@ -44,6 +46,6 @@ case "$board" in
 	;;
 esac
 
-ucidef_commit_leds
+board_config_flush
 
 exit 0
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network
similarity index 56%
rename from target/linux/kirkwood/base-files/etc/uci-defaults/02_network
rename to target/linux/kirkwood/base-files/etc/board.d/02_network
index 3491b5807b..eb091745af 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/board.d/02_network
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
 #
 
 [ -e /etc/config/network ] && exit 0
@@ -20,13 +20,15 @@ set network.lan6.reqprefix='no'
 EOF
 }
 
-. /lib/functions/uci-defaults.sh
+. /lib/functions/uci-defaults-new.sh
 . /lib/kirkwood.sh
 
-board=$(kirkwood_board_name)
+board_config_update
 
 ucidef_set_interface_loopback
 
+board=$(kirkwood_board_name)
+
 case "$board" in
 "dockstar"|\
 "goflexhome"|\
@@ -35,29 +37,25 @@ case "$board" in
 "ib62x0"|\
 "nsa310s"|\
 "pogo_e02")
-	set_lan_dhcp "eth0"
+	ucidef_set_interface_lan "eth0" "dhcp"
 	;;
 "linksys-audi")
-	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	ucidef_add_switch "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
-	ucidef_add_switch_vlan "switch0" "2" "4 6"
+	ucidef_add_switch "switch0" \
+		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1"
 	;;
 "linksys-viper")
-	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	ucidef_add_switch "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
-	ucidef_add_switch_vlan "switch0" "2" "4 6"
+	ucidef_add_switch "switch0" \
+		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1"
 	;;
 "guruplug-server-plus")
-	set_lan_dhcp "eth0" "eth1"
+	ucidef_set_interface_lan "eth0 eth1" "dhcp"
 	;;
 "sheevaplug" | \
 "sheevaplug-esata")
-	set_lan_dhcp "eth0"
+	ucidef_set_interface_lan "eth0" "dhcp"
 	;;
 *)
-	ucidef_set_interface_lan "eth0"
+	ucidef_set_interface_lan "eth0" "static"
 	;;
 esac
 
-- 
2.30.2