From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Dec 2015 22:27:18 +0000 (+0000)
Subject: kirkwood: switch from uci-defaults to board.d
X-Git-Tag: reboot~1328
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7514b6d73b7cad9e6f13ae9527eeee39630a10a8;p=openwrt%2Fstaging%2Flynxis.git

kirkwood: switch from uci-defaults to board.d

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

SVN-Revision: 47733
---

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/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds
new file mode 100644
index 0000000000..9e84d8bb20
--- /dev/null
+++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Copyright (C) 2012-2015 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/kirkwood.sh
+
+board_config_update
+
+board=$(kirkwood_board_name)
+
+case "$board" in
+"dockstar")
+	ucidef_set_led_default "health" "health" "status:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "status:orange:fault" "1"
+	;;
+"linksys-audi")
+	ucidef_set_led_default "power" "power" "audi:green:power" "1"
+	;;
+"linksys-viper")
+	ucidef_set_led_default "health" "health" "viper:white:health" "1"
+	ucidef_set_led_default "pulse" "pulse" "viper:white:pulse" "1"
+	;;
+"goflexhome" | \
+"goflexnet")
+	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"
+	ucidef_set_led_default "fault" "fault" "ib62x0:red:os" "1"
+	;;
+"pogo_e02")
+	ucidef_set_led_default "health" "health" "pogo_e02:green:health" "1"
+	ucidef_set_led_default "fault" "fault" "pogo_e02:orange:fault" "1"
+	;;
+"guruplug-server-plus")
+	ucidef_set_led_timer "health" "health" "guruplug:red:health" "200" "800"
+	;;
+"sheevaplug" | \
+"sheevaplug-esata")
+	ucidef_set_led_timer "health" "health" "sheevaplug:blue:health" "200" "800"
+	;;
+*)
+	;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network
new file mode 100644
index 0000000000..eb091745af
--- /dev/null
+++ b/target/linux/kirkwood/base-files/etc/board.d/02_network
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Copyright (C) 2012-2015 OpenWrt.org
+#
+
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
+set_lan_dhcp() {
+	local ifname=$1
+	uci batch <<EOF
+set network.lan='interface'
+set network.lan.ifname='$ifname'
+set network.lan.proto='dhcp'
+set network.lan6='interface'
+set network.lan6.ifname='@lan'
+set network.lan6.proto='dhcpv6'
+set network.lan6.reqprefix='no'
+EOF
+}
+
+. /lib/functions/uci-defaults-new.sh
+. /lib/kirkwood.sh
+
+board_config_update
+
+ucidef_set_interface_loopback
+
+board=$(kirkwood_board_name)
+
+case "$board" in
+"dockstar"|\
+"goflexhome"|\
+"goflexnet"|\
+"iconnect"|\
+"ib62x0"|\
+"nsa310s"|\
+"pogo_e02")
+	ucidef_set_interface_lan "eth0" "dhcp"
+	;;
+"linksys-audi")
+	ucidef_add_switch "switch0" \
+		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1"
+	;;
+"linksys-viper")
+	ucidef_add_switch "switch0" \
+		"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" "6@eth1"
+	;;
+"guruplug-server-plus")
+	ucidef_set_interface_lan "eth0 eth1" "dhcp"
+	;;
+"sheevaplug" | \
+"sheevaplug-esata")
+	ucidef_set_interface_lan "eth0" "dhcp"
+	;;
+*)
+	ucidef_set_interface_lan "eth0" "static"
+	;;
+esac
+
+uci commit network
+
+exit 0
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
deleted file mode 100644
index d6c0e1e15e..0000000000
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-. /lib/kirkwood.sh
-
-board=$(kirkwood_board_name)
-
-case "$board" in
-"dockstar")
-	ucidef_set_led_default "health" "health" "status:green:health" "1"
-	ucidef_set_led_default "fault" "fault" "status:orange:fault" "1"
-	;;
-"linksys-audi")
-	ucidef_set_led_default "power" "power" "audi:green:power" "1"
-	;;
-"linksys-viper")
-	ucidef_set_led_default "health" "health" "viper:white:health" "1"
-	ucidef_set_led_default "pulse" "pulse" "viper:white:pulse" "1"
-	;;
-"goflexhome" | \
-"goflexnet")
-        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"
-	ucidef_set_led_default "fault" "fault" "ib62x0:red:os" "1"
-	;;
-"pogo_e02")
-	ucidef_set_led_default "health" "health" "pogo_e02:green:health" "1"
-	ucidef_set_led_default "fault" "fault" "pogo_e02:orange:fault" "1"
-	;;
-"guruplug-server-plus")
-	ucidef_set_led_timer "health" "health" "guruplug:red:health" "200" "800"
-	;;
-"sheevaplug" | \
-"sheevaplug-esata")
-	ucidef_set_led_timer "health" "health" "sheevaplug:blue:health" "200" "800"
-	;;
-*)
-	;;
-esac
-
-ucidef_commit_leds
-
-exit 0
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
deleted file mode 100644
index 3491b5807b..0000000000
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-
-[ -e /etc/config/network ] && exit 0
-
-touch /etc/config/network
-
-set_lan_dhcp() {
-	local ifname=$1
-	uci batch <<EOF
-set network.lan='interface'
-set network.lan.ifname='$ifname'
-set network.lan.proto='dhcp'
-set network.lan6='interface'
-set network.lan6.ifname='@lan'
-set network.lan6.proto='dhcpv6'
-set network.lan6.reqprefix='no'
-EOF
-}
-
-. /lib/functions/uci-defaults.sh
-. /lib/kirkwood.sh
-
-board=$(kirkwood_board_name)
-
-ucidef_set_interface_loopback
-
-case "$board" in
-"dockstar"|\
-"goflexhome"|\
-"goflexnet"|\
-"iconnect"|\
-"ib62x0"|\
-"nsa310s"|\
-"pogo_e02")
-	set_lan_dhcp "eth0"
-	;;
-"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"
-	;;
-"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"
-	;;
-"guruplug-server-plus")
-	set_lan_dhcp "eth0" "eth1"
-	;;
-"sheevaplug" | \
-"sheevaplug-esata")
-	set_lan_dhcp "eth0"
-	;;
-*)
-	ucidef_set_interface_lan "eth0"
-	;;
-esac
-
-uci commit network
-
-exit 0